Resolving conflict with app/models/ci/runner.rb

11123e4a · Ian Baum · 4ff5cb8d · 11123e4a
Commit 11123e4a authored Feb 07, 2018 by Ian Baum
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/ci/runner.rb app/models/ci/runner.rb +0 -3

No files found.
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -3,10 +3,7 @@ module Ci
    extend Gitlab::Ci::Model
    include Gitlab::SQL::Pattern
    include RedisCacheable
-<<<<<<< HEAD
    prepend EE::Ci::Runner
-=======
->>>>>>> upstream/master

    RUNNER_QUEUE_EXPIRY_TIME = 60.minutes
    ONLINE_CONTACT_TIMEOUT = 1.hour