Resolve conflict in app/workers/project_cache_worker.rb

9ec1644f · Imre Farkas · be0eca32 · 9ec1644f
Commit 9ec1644f authored Jul 02, 2018 by Imre Farkas
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
@@ -4,10 +4,7 @@
 class ProjectCacheWorker
  include ApplicationWorker
  include ExclusiveLeaseGuard
-<<<<<<< HEAD
  prepend EE::Workers::ProjectCacheWorker
-=======
->>>>>>> upstream/master

  LEASE_TIMEOUT = 15.minutes.to_i