Fixed ExclusiveLease conflicts

de31766d · Yorick Peterse · d887601a · de31766d
Commit de31766d authored Jan 08, 2018 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/exclusive_lease.rb lib/gitlab/exclusive_lease.rb +0 -3

No files found.
--- a/lib/gitlab/exclusive_lease.rb
+++ b/lib/gitlab/exclusive_lease.rb
@@ -94,7 +94,6 @@ module Gitlab
        ttl if ttl.positive?
      end
    end
-<<<<<<< HEAD

    # Returns true if the UUID for the key hasn't changed.
    def same_uuid?
@@ -102,7 +101,5 @@ module Gitlab
        redis.get(@redis_shared_state_key) == @uuid
      end
    end
-=======
->>>>>>> upstream/master
  end
 end