Resolve conflicts in template_finder.rb

8dbb497a · Bob Van Landuyt · 3e0a7a71 · 8dbb497a
Commit 8dbb497a authored Sep 06, 2018 by Bob Van Landuyt
Show 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
 class TemplateFinder
-<<<<<<< HEAD
  prepend ::EE::TemplateFinder

-=======
->>>>>>> upstream/master
  VENDORED_TEMPLATES = {
    dockerfiles: ::Gitlab::Template::DockerfileTemplate,
    gitignores: ::Gitlab::Template::GitignoreTemplate,