Resolve conflict in app/models/ci/pipeline.rb

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

app/models/ci/pipeline.rb

@@ -466,13 +466,10 @@ module Ci
         .fabricate!
     end
 
-<<<<<<< HEAD
     def codeclimate_artifact
       artifacts.codequality.find(&:has_codeclimate_json?)
     end
 
-=======
->>>>>>> ce-com/master
     def latest_builds_with_artifacts
       @latest_builds_with_artifacts ||= builds.latest.with_artifacts
     end

spec/models/ci/pipeline_spec.rb

@@ -1463,7 +1463,6 @@ describe Ci::Pipeline, :mailer do
       expect(query_count).to eq(1)
     end
   end
-<<<<<<< HEAD
 
   describe '#codeclimate_artifact' do
     context 'has codequality job' do
@@ -1492,6 +1491,4 @@ describe Ci::Pipeline, :mailer do
       it { expect(pipeline.codeclimate_artifact).to be_nil }
     end
   end
-=======
->>>>>>> ce-com/master
 end