Resolve conflict in spec/initializers/6_validations_spec.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

spec/initializers/6_validations_spec.rb

@@ -109,7 +109,6 @@ describe '6_validations' do
         expect { validate_storages_paths }.not_to raise_error
       end
     end
-<<<<<<< HEAD
   end
 
   context 'with incomplete settings' do
@@ -130,8 +129,6 @@ describe '6_validations' do
     it 'throws an error suggesting the user to update its settings' do
       expect { validate_storages_config }.to raise_error("foo is not a valid storage, because it has no `path` key. It may be configured as:\n\nfoo:\n  path: tmp/tests/paths/a/b/c\n\nFor source installations, update your config/gitlab.yml Refer to gitlab.yml.example for an updated example.\n\nIf you're using the Gitlab Development Kit, you can update your configuration running `gdk reconfigure`.\n")
     end
-=======
->>>>>>> upstream/master
   end
 
   def mock_storages(storages)