Resolve conflicts in app/finders/template_finder.rb

e8f26adf · Stan Hu · 5f2d7e11 · e8f26adf
Commit e8f26adf authored Oct 06, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/finders/template_finder.rb app/finders/template_finder.rb +0 -3

No files found.
--- a/app/finders/template_finder.rb
+++ b/app/finders/template_finder.rb
@@ -3,11 +3,8 @@
 class TemplateFinder
  include Gitlab::Utils::StrongMemoize

-<<<<<<< HEAD
  prepend ::EE::TemplateFinder

-=======
->>>>>>> upstream/master
  VENDORED_TEMPLATES = HashWithIndifferentAccess.new(
    dockerfiles: ::Gitlab::Template::DockerfileTemplate,
    gitignores: ::Gitlab::Template::GitignoreTemplate,