Commit aa5dd750 authored by Eric Eastwood's avatar Eric Eastwood

Resolve favicon conflict

parent 02331173
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment