Resolved conflicts in Projects::AfterRenameService

6f372150 · Yorick Peterse · fcc8ce26 · 6f372150
Commit 6f372150 authored Oct 23, 2018 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/services/projects/after_rename_service.rb
+++ b/app/services/projects/after_rename_service.rb
@@ -12,11 +12,8 @@ module Projects
  #
  #     Projects::AfterRenameService.new(project).execute
  class AfterRenameService
-<<<<<<< HEAD
    prepend ::EE::Projects::AfterRenameService

-=======
->>>>>>> upstream/master
    attr_reader :project, :full_path_before, :full_path_after, :path_before

    RenameFailedError = Class.new(StandardError)