Skip to content

G
gitlab-ce
Commit e8f26adf authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/finders/template_finder.rb

parent 5f2d7e11
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/finders/template_finder.rb
View file @ e8f26adf
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
class TemplateFinder class TemplateFinder
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
<<<<<<< HEAD
prepend ::EE::TemplateFinder prepend ::EE::TemplateFinder
=======
>>>>>>> upstream/master
VENDORED_TEMPLATES = HashWithIndifferentAccess.new( VENDORED_TEMPLATES = HashWithIndifferentAccess.new(
dockerfiles: ::Gitlab::Template::DockerfileTemplate, dockerfiles: ::Gitlab::Template::DockerfileTemplate,
gitignores: ::Gitlab::Template::GitignoreTemplate, gitignores: ::Gitlab::Template::GitignoreTemplate,
......
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