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

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

app/models/ci/runner.rb

 module Ci
   class Runner < ActiveRecord::Base
-<<<<<<< HEAD
-    extend Ci::Model
-    prepend EE::Ci::Runner
-=======
     extend Gitlab::Ci::Model
->>>>>>> upstream/master
+    prepend EE::Ci::Runner
 
     RUNNER_QUEUE_EXPIRY_TIME = 60.minutes
     ONLINE_CONTACT_TIMEOUT = 1.hour