Resolve conflict in spec/serializers/pipeline_serializer_spec.rb

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

spec/serializers/pipeline_serializer_spec.rb

@@ -125,11 +125,7 @@ describe PipelineSerializer do
         it 'verifies number of queries', :request_store do
           recorded = ActiveRecord::QueryRecorder.new { subject }
 
-<<<<<<< HEAD
-          expect(recorded.count).to be_within(1).of(48)
-=======
-          expect(recorded.count).to be_within(2).of(27)
->>>>>>> upstream/master
+          expect(recorded.count).to be_within(2).of(32)
           expect(recorded.cached_count).to eq(0)
         end
       end
@@ -148,11 +144,7 @@ describe PipelineSerializer do
           # pipeline. With the same ref this check is cached but if refs are
           # different then there is an extra query per ref
           # https://gitlab.com/gitlab-org/gitlab-ce/issues/46368
-<<<<<<< HEAD
-          expect(recorded.count).to be_within(1).of(56)
-=======
-          expect(recorded.count).to be_within(2).of(30)
->>>>>>> upstream/master
+          expect(recorded.count).to be_within(2).of(35)
           expect(recorded.cached_count).to eq(0)
         end
       end