resolve conflicts on spec/lib/gitlab/current_settings_spec.rb

spec/lib/gitlab/current_settings_spec.rb

@@ -26,7 +26,6 @@ describe Gitlab::CurrentSettings do
         allow(ActiveRecord::Base.connection).to receive(:active?).and_return(true)
         allow(ActiveRecord::Base.connection).to receive(:table_exists?).and_call_original
         allow(ActiveRecord::Base.connection).to receive(:table_exists?).with('application_settings').and_return(true)
-<<<<<<< HEAD
       end
 
       # This method returns the ::ApplicationSetting.defaults hash
@@ -35,8 +34,6 @@ describe Gitlab::CurrentSettings do
         defaults = ::ApplicationSetting.defaults
         ar_wrapped_defaults = ::ApplicationSetting.new(defaults).attributes
         ar_wrapped_defaults.slice(*defaults.keys)
-=======
->>>>>>> upstream/master
       end
 
       it 'attempts to use cached values first' do