Resolve conflicts in favicon related files

app/views/admin/appearances/_form.html.haml

@@ -37,11 +37,8 @@
         %br
         The resulting favicons will be cropped to be square and scaled down to a size of 32x32 px.
 
-<<<<<<< HEAD
   = render partial: 'admin/appearances/system_header_footer_form', locals: { form: f }
 
-=======
->>>>>>> upstream/master
   %fieldset.sign-in
     %legend
       Sign in/Sign up pages:

lib/gitlab/favicon.rb

@@ -8,11 +8,7 @@ module Gitlab
           if Gitlab::Utils.to_boolean(ENV['CANARY'])
             'favicon-yellow.png'
           elsif Rails.env.development?
-<<<<<<< HEAD
             'favicon-green.png'
-=======
-            'favicon-blue.png'
->>>>>>> upstream/master
           else
             'favicon.png'
           end

spec/lib/gitlab/favicon_spec.rb

@@ -7,15 +7,9 @@ RSpec.describe Gitlab::Favicon, :request_store do
       expect(described_class.main).to match_asset_path '/assets/favicon.png'
     end
 
-<<<<<<< HEAD
     it 'has green favicon for development' do
       allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development'))
       expect(described_class.main).to match_asset_path 'favicon-green.png'
-=======
-    it 'has blue favicon for development' do
-      allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development'))
-      expect(described_class.main).to match_asset_path '/assets/favicon-blue.png'
->>>>>>> upstream/master
     end
 
     it 'has yellow favicon for canary' do