resolve conflict in app/services/projects/update_service.rb

c920693e · Lukas Eipert · 128f37a2 · c920693e
Commit c920693e authored Aug 03, 2018 by Lukas Eipert
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -4,11 +4,8 @@ module Projects
  class UpdateService < BaseService
    include UpdateVisibilityLevel

-<<<<<<< HEAD
    prepend ::EE::Projects::UpdateService

-=======
->>>>>>> upstream/master
    ValidationError = Class.new(StandardError)

    def execute