Skip to content

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

Resolve conflicts in app/finders/license_template_finder.rb

parent 0fcdb9b3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/finders/license_template_finder.rb
View file @ d34c9d7b
...@@ -8,11 +8,8 @@ ...@@ -8,11 +8,8 @@
# false, all licenses except popular ones are shown. When nil (the # false, all licenses except popular ones are shown. When nil (the
# default), *all* licenses will be shown. # default), *all* licenses will be shown.
class LicenseTemplateFinder class LicenseTemplateFinder
<<<<<<< HEAD
prepend ::EE::LicenseTemplateFinder prepend ::EE::LicenseTemplateFinder
=======
>>>>>>> upstream/master
attr_reader :params attr_reader :params
def initialize(params = {}) def initialize(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