Skip to content

G
gitlab-ce
Commit 32c0a93a authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files
Options

Resolve conflicts in app/services/projects/create_from_template_service.rb

parent 25c00fb2
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/services/projects/create_from_template_service.rb
View file @ 32c0a93a
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
module Projects module Projects
class CreateFromTemplateService < BaseService class CreateFromTemplateService < BaseService
<<<<<<< HEAD
prepend ::EE::Projects::CreateFromTemplateService prepend ::EE::Projects::CreateFromTemplateService
=======
>>>>>>> upstream/master
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
def initialize(user, params) def initialize(user, params)
......
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