fix github resolve

Signed-off-by: Christoph Hartmann <[email protected]>

Author: chris-rock

Rakefile

@@ -1,18 +1,10 @@
 #!/usr/bin/env rake
 
-<<<<<<< master
 # Style tests. cookstyle (rubocop) and Foodcritic
 namespace :style do
   begin
     require 'cookstyle'
     require 'rubocop/rake_task'
-=======
-require 'foodcritic'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
-require 'chef/cookbook/metadata'
->>>>>>> master
-
     desc 'Run Ruby style checks'
     RuboCop::RakeTask.new(:ruby)
   rescue LoadError => e
@@ -36,6 +28,7 @@ end
 
 desc 'Run all style checks'
 task style: ['style:chef', 'style:ruby']
+task lint: ['style']
 
 # ChefSpec
 begin
@@ -76,6 +69,8 @@ task default: %w(style spec)
 # Automatically generate a changelog for this project. Only loaded if
 # the necessary gem is installed.
 begin
+  require 'chef/cookbook/metadata'
+
   # read version from metadata
   metadata = Chef::Cookbook::Metadata.new
   metadata.instance_eval(File.read('metadata.rb'))

metadata.rb

@@ -21,12 +21,8 @@
 license          'Apache 2.0'
 description      'Configures nginx hardening'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-<<<<<<< master
-version          '1.0.0'
 
-depends 'chef_nginx', '>= 4.0'
-=======
-version          "1.1.0"
+version          "2.0.0"
 
 issues_url       'https://github.com/dev-sec/chef-nginx-hardening/issues'
 source_url       'https://github.com/dev-sec/chef-nginx-hardening'
@@ -35,8 +31,7 @@
 supports 'ubuntu', '>= 12.04'
 supports 'centos', '>= 6.6'
 
-depends 'chef_nginx'
->>>>>>> master
+depends 'chef_nginx', '>= 4.0'
 depends 'openssl'
 
 recipe 'nginx-hardening::default', 'configures nginx for hardening'