Resolve conflicts in app/services/concerns/exclusive_lease_guard.rb

75f1b586 · Ash McKenzie · 2c82998a · 75f1b586
Commit 75f1b586 authored May 08, 2018 by Ash McKenzie
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/services/concerns/exclusive_lease_guard.rb app/services/concerns/exclusive_lease_guard.rb +0 -4

No files found.
--- a/app/services/concerns/exclusive_lease_guard.rb
+++ b/app/services/concerns/exclusive_lease_guard.rb
@@ -35,11 +35,7 @@ module ExclusiveLeaseGuard

  def lease_timeout
    raise NotImplementedError,
-<<<<<<< HEAD
      "#{self.class.name} does not implement #{__method__}"
-=======
-          "#{self.class.name} does not implement #{__method__}"
->>>>>>> upstream/master
  end

  def release_lease(uuid)