resolved conflicts

app/helpers/appearances_helper.rb

@@ -3,11 +3,7 @@ module AppearancesHelper
     if brand_item && brand_item.title
       brand_item.title
     else
-<<<<<<< HEAD
       'GitLab Enterprise Edition'
-=======
-      'GitLab Community Edition'
->>>>>>> 204a9895333178cc90b40ef365ad566d750fa594
     end
   end
 

app/models/appearance.rb

-<<<<<<< HEAD
 # == Schema Information
 #
 # Table name: appearances
@@ -13,8 +12,6 @@
 #  header_logo  :string(255)
 #
 
-=======
->>>>>>> 204a9895333178cc90b40ef365ad566d750fa594
 class Appearance < ActiveRecord::Base
   validates :title,       presence: true
   validates :description, presence: true