Resolve app/workers/project_cache_worker.rb

55987a5e · Sean McGivern · bcd188c0 · 55987a5e
Commit 55987a5e authored Jul 05, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/workers/project_cache_worker.rb app/workers/project_cache_worker.rb +0 -3

No files found.
--- a/app/workers/project_cache_worker.rb
+++ b/app/workers/project_cache_worker.rb
@@ -3,10 +3,7 @@
 # Worker for updating any project specific caches.
 class ProjectCacheWorker
  include ApplicationWorker
-<<<<<<< HEAD
  prepend EE::Workers::ProjectCacheWorker
-=======
->>>>>>> upstream/master

  LEASE_TIMEOUT = 15.minutes.to_i