Resolve conflict in project_cache_worker.rb

587df766 · Douwe Maan · 8d0471c6 · 587df766
Commit 587df766 authored Dec 06, 2017 by Douwe Maan
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
 # Worker for updating any project specific caches.
 class ProjectCacheWorker
  include ApplicationWorker
-<<<<<<< HEAD
  prepend EE::Workers::ProjectCacheWorker
-=======
->>>>>>> upstream/master

  LEASE_TIMEOUT = 15.minutes.to_i