Resolve conflicts in app/models/ci/runner.rb and spec/services/ci/retry_build_service_spec.rb

app/models/ci/runner.rb

@@ -4,10 +4,7 @@ module Ci
     include Gitlab::SQL::Pattern
     include RedisCacheable
     include ChronicDurationAttribute
-<<<<<<< HEAD
     prepend EE::Ci::Runner
-=======
->>>>>>> upstream/master
 
     RUNNER_QUEUE_EXPIRY_TIME = 60.minutes
     ONLINE_CONTACT_TIMEOUT = 1.hour

spec/services/ci/retry_build_service_spec.rb

@@ -29,13 +29,8 @@ describe Ci::RetryBuildService do
        commit_id deployments erased_by_id last_deployment project_id
        runner_id tag_taggings taggings tags trigger_request_id
        user_id auto_canceled_by_id retried failure_reason
-<<<<<<< HEAD
        sourced_pipelines artifacts_file_store artifacts_metadata_store
        metadata].freeze # EE
-=======
-       artifacts_file_store artifacts_metadata_store
-       metadata].freeze
->>>>>>> upstream/master
 
   shared_examples 'build duplication' do
     let(:another_pipeline) { create(:ci_empty_pipeline, project: project) }