Resolve app/services/projects/cleanup_service.rb

7aeaf0c7 · Robert Speicher · 30b80df9 · 7aeaf0c7
Commit 7aeaf0c7 authored Dec 06, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/projects/cleanup_service.rb app/services/projects/cleanup_service.rb +0 -3

No files found.
--- a/app/services/projects/cleanup_service.rb
+++ b/app/services/projects/cleanup_service.rb
@@ -50,8 +50,5 @@ module Projects
    end
  end
 end
-<<<<<<< HEAD

 ::Projects::CleanupService.prepend(::EE::Projects::CleanupService)
-=======
->>>>>>> upstream/master