Resolve conflicts in app/models/remote_mirror.rb

6bca1fee · Ash McKenzie · 459ce33a · 6bca1fee
Commit 6bca1fee authored May 08, 2018 by Ash McKenzie
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/remote_mirror.rb app/models/remote_mirror.rb +0 -3

No files found.
--- a/app/models/remote_mirror.rb
+++ b/app/models/remote_mirror.rb
 class RemoteMirror < ActiveRecord::Base
  include AfterCommitQueue

-<<<<<<< HEAD
  prepend EE::RemoteMirror

-=======
->>>>>>> upstream/master
  PROTECTED_BACKOFF_DELAY   = 1.minute
  UNPROTECTED_BACKOFF_DELAY = 5.minutes