Resolve favicon conflict

aa5dd750 · Eric Eastwood · 02331173 · aa5dd750
Commit aa5dd750 authored Mar 29, 2018 by Eric Eastwood
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -40,11 +40,7 @@ module PageLayoutHelper
  def favicon
    return 'favicon-yellow.ico' if Gitlab::Utils.to_boolean(ENV['CANARY'])
-<<<<<<< HEAD
    return 'favicon-green.ico' if Rails.env.development?
-=======
-    return 'favicon-blue.ico' if Rails.env.development?
->>>>>>> upstream/master
    'favicon.ico'
  end