Resolve conflict in spec/requests/api/settings_spec.rb

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

spec/requests/api/settings_spec.rb

@@ -11,11 +11,7 @@ describe API::Settings, 'Settings' do
       expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Hash
       expect(json_response['default_projects_limit']).to eq(42)
-<<<<<<< HEAD
-      expect(json_response['signin_enabled']).to be_truthy
-=======
       expect(json_response['password_authentication_enabled_for_web']).to be_truthy
->>>>>>> ce/master
       expect(json_response['repository_storages']).to eq(['default'])
       expect(json_response['password_authentication_enabled']).to be_truthy
       expect(json_response['koding_enabled']).to be_falsey
@@ -43,12 +39,8 @@ describe API::Settings, 'Settings' do
       it "updates application settings" do
         put api("/application/settings", admin),
           default_projects_limit: 3,
-<<<<<<< HEAD
-=======
           password_authentication_enabled_for_web: false,
->>>>>>> ce/master
           repository_storages: ['custom'],
-          password_authentication_enabled: false,
           koding_enabled: true,
           koding_url: 'http://koding.example.com',
           plantuml_enabled: true,
@@ -68,12 +60,7 @@ describe API::Settings, 'Settings' do
 
         expect(response).to have_gitlab_http_status(200)
         expect(json_response['default_projects_limit']).to eq(3)
-<<<<<<< HEAD
-        expect(json_response['signin_enabled']).to be_falsey
-        expect(json_response['password_authentication_enabled']).to be_falsey
-=======
         expect(json_response['password_authentication_enabled_for_web']).to be_falsey
->>>>>>> ce/master
         expect(json_response['repository_storages']).to eq(['custom'])
         expect(json_response['koding_enabled']).to be_truthy
         expect(json_response['koding_url']).to eq('http://koding.example.com')