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

32c0a93a · Bob Van Landuyt · 25c00fb2 · 32c0a93a
Commit 32c0a93a authored Aug 01, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/services/projects/create_from_template_service.rb
+++ b/app/services/projects/create_from_template_service.rb
@@ -2,10 +2,7 @@

 module Projects
  class CreateFromTemplateService < BaseService
-<<<<<<< HEAD
    prepend ::EE::Projects::CreateFromTemplateService
-=======
->>>>>>> upstream/master
    include Gitlab::Utils::StrongMemoize

    def initialize(user, params)