Fixed pipeline serializer merge conflicts

app/serializers/pipeline_serializer.rb

@@ -11,11 +11,8 @@ class PipelineSerializer < BaseSerializer
         :retryable_builds,
         :cancelable_statuses,
         :trigger_requests,
-<<<<<<< HEAD
         { triggered_by_pipeline: [:project, :user] },
         { triggered_pipelines: [:project, :user] },
-=======
->>>>>>> upstream/master
         :manual_actions,
         :artifacts,
         {

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(2).of(35)
-=======
-          expect(recorded.count).to be_within(2).of(31)
->>>>>>> upstream/master
           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(2).of(40)
-=======
-          expect(recorded.count).to be_within(2).of(34)
->>>>>>> upstream/master
           expect(recorded.cached_count).to eq(0)
         end
       end