Resolve conflicts in app/finders/license_template_finder.rb

d34c9d7b · Stan Hu · 0fcdb9b3 · d34c9d7b
Commit d34c9d7b authored Aug 18, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/finders/license_template_finder.rb
+++ b/app/finders/license_template_finder.rb
@@ -8,11 +8,8 @@
 #            false, all licenses except popular ones are shown. When nil (the
 #            default), *all* licenses will be shown.
 class LicenseTemplateFinder
-<<<<<<< HEAD
  prepend ::EE::LicenseTemplateFinder

-=======
->>>>>>> upstream/master
  attr_reader :params

  def initialize(params = {})