Commit 32c0a93a authored by Bob Van Landuyt's avatar Bob Van Landuyt

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

parent 25c00fb2
......@@ -2,10 +2,7 @@
module Projects
class CreateFromTemplateService < BaseService
<<<<<<< HEAD
prepend ::EE::Projects::CreateFromTemplateService
=======
>>>>>>> upstream/master
include Gitlab::Utils::StrongMemoize
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