Fix conflicts in application_settings_controller.rb and spec/features/admin/admin_settings_spec.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/controllers/admin/application_settings_controller.rb

@@ -59,19 +59,11 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
 
   def application_setting_params
     params[:application_setting] ||= {}
-<<<<<<< HEAD
 
     if params[:application_setting].key?(:enabled_oauth_sign_in_sources)
       enabled_oauth_sign_in_sources = params[:application_setting].delete(:enabled_oauth_sign_in_sources)
       enabled_oauth_sign_in_sources&.delete("")
 
-=======
-
-    if params[:application_setting].key?(:enabled_oauth_sign_in_sources)
-      enabled_oauth_sign_in_sources = params[:application_setting].delete(:enabled_oauth_sign_in_sources)
-      enabled_oauth_sign_in_sources&.delete("")
-
->>>>>>> upstream/master
       params[:application_setting][:disabled_oauth_sign_in_sources] =
         AuthHelper.button_based_providers.map(&:to_s) -
         Array(enabled_oauth_sign_in_sources)

spec/features/admin/admin_settings_spec.rb

@@ -32,7 +32,6 @@ feature 'Admin updates settings' do
     expect(find('#application_setting_visibility_level_20')).not_to be_checked
   end
 
-<<<<<<< HEAD
   describe 'LDAP settings' do
     context 'with LDAP enabled' do
       scenario 'Change allow group owners to manage ldap' do
@@ -58,8 +57,6 @@ feature 'Admin updates settings' do
     end
   end
 
-=======
->>>>>>> upstream/master
   scenario 'Modify import sources' do
     expect(Gitlab::CurrentSettings.import_sources).not_to be_empty