Skip to content

G
gitlab-ce
Commit c920693e authored by Lukas Eipert's avatar Lukas Eipert
Browse files
Options

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

parent 128f37a2
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/services/projects/update_service.rb
View file @ c920693e
...@@ -4,11 +4,8 @@ module Projects ...@@ -4,11 +4,8 @@ module Projects
class UpdateService < BaseService class UpdateService < BaseService
include UpdateVisibilityLevel include UpdateVisibilityLevel
<<<<<<< HEAD
prepend ::EE::Projects::UpdateService prepend ::EE::Projects::UpdateService
=======
>>>>>>> upstream/master
ValidationError = Class.new(StandardError) ValidationError = Class.new(StandardError)
def execute def execute
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7