glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed unfound merge conflict

Browse source
This commit is contained in:
Connor Turland 2014-12-03 09:00:05 -05:00
parent a83c3e4b85
commit d069cecc9b
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/uservoice.css
View file

@ -6,12 +6,8 @@
} }
div.uv-icon.uv-bottom-left { div.uv-icon.uv-bottom-left {
<<<<<<< HEAD
background-image:url(support_tab_sprite.png); background-image:url(support_tab_sprite.png);
=======
background-image:url(feedback_sprite.png);
background-repeat: no-repeat; background-repeat: no-repeat;
>>>>>>> develop
color:#FFFFFF; color:#FFFFFF;
cursor:pointer; cursor:pointer;
height:110px; height:110px;