Resolve conflicts in app/finders/license_template_finder.rb

5f2d7e11 · Stan Hu · 77568dc8 · 5f2d7e11
Commit 5f2d7e11 authored Oct 06, 2018 by Stan Hu
Hide 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
@@ -13,11 +13,8 @@
 class LicenseTemplateFinder
  include Gitlab::Utils::StrongMemoize

-<<<<<<< HEAD
  prepend ::EE::LicenseTemplateFinder

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

  def initialize(project, params = {})