CE->EE: resolve conflicts in specs

spec/lib/gitlab/ldap/config_spec.rb

@@ -15,11 +15,7 @@ describe Gitlab::LDAP::Config do
     end
 
     it 'raises an error if a unknown provider is used' do
-<<<<<<< HEAD
       expect { described_class.new 'unknown' }.to raise_error(Gitlab::LDAP::Config::InvalidProvider)
-=======
-      expect { described_class.new 'unknown' }.to raise_error(RuntimeError)
->>>>>>> ce/master
     end
   end
 

spec/serializers/pipeline_serializer_spec.rb

@@ -111,11 +111,7 @@ describe PipelineSerializer do
       shared_examples 'no N+1 queries' do
         it 'verifies number of queries', :request_store do
           recorded = ActiveRecord::QueryRecorder.new { subject }
-<<<<<<< HEAD
           expect(recorded.count).to be_within(1).of(61)
-=======
-          expect(recorded.count).to be_within(1).of(57)
->>>>>>> ce/master
           expect(recorded.cached_count).to eq(0)
         end
       end