Resolve app/models/ci/runner.rb

bcdc9410 · Robert Speicher · 06f265a4 · bcdc9410
Commit bcdc9410 authored Sep 17, 2018 by Robert Speicher
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
@@ -8,10 +8,7 @@ module Ci
    include RedisCacheable
    include ChronicDurationAttribute
    include FromUnion
-<<<<<<< HEAD
    prepend EE::Ci::Runner
-=======
->>>>>>> upstream/master

    RUNNER_QUEUE_EXPIRY_TIME = 60.minutes
    ONLINE_CONTACT_TIMEOUT = 1.hour