Skip to content

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

Resolve conflicts in app/finders/license_template_finder.rb

parent 77568dc8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/finders/license_template_finder.rb
View file @ 5f2d7e11
...@@ -13,11 +13,8 @@ ...@@ -13,11 +13,8 @@
class LicenseTemplateFinder class LicenseTemplateFinder
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
<<<<<<< HEAD
prepend ::EE::LicenseTemplateFinder prepend ::EE::LicenseTemplateFinder
=======
>>>>>>> upstream/master
attr_reader :project, :params attr_reader :project, :params
def initialize(project, params = {}) def initialize(project, 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7