Resolve conflict with appearances_helper.rb

19c4918b · André Luís · a854d62b · 19c4918b
Commit 19c4918b authored Apr 02, 2018 by André Luís
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/helpers/appearances_helper.rb app/helpers/appearances_helper.rb +0 -4

No files found.
--- a/app/helpers/appearances_helper.rb
+++ b/app/helpers/appearances_helper.rb
@@ -2,11 +2,7 @@ module AppearancesHelper
  prepend EE::AppearancesHelper
  def brand_title
-<<<<<<< HEAD
    current_appearance&.title.presence || 'GitLab Enterprise Edition'
-=======
-    current_appearance&.title.presence || 'GitLab Community Edition'
->>>>>>> upstream/master
  end
  def brand_image