Resolve conflict in app/helpers/appearances_helper.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/helpers/appearances_helper.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
8b120a34 · Rémy Coutable · fc31da4c · 8b120a34
Commit 8b120a34 authored Dec 06, 2017 by Rémy Coutable
Show 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
 module AppearancesHelper
  def brand_title
-<<<<<<< HEAD
    brand_item&.title.presence || 'GitLab Enterprise Edition'
-=======
-    brand_item&.title.presence || 'GitLab Community Edition'
->>>>>>> upstream/master
  end
  def brand_image