fixed unfound merge conflict

2014-12-03 09:00:05 -05:00 · 2014-12-03 09:00:05 -05:00 · d069cecc9b
parent a83c3e4b85
commit d069cecc9b
1 changed files with 0 additions and 4 deletions
--- a/app/assets/stylesheets/uservoice.css
+++ b/app/assets/stylesheets/uservoice.css
@ -6,12 +6,8 @@
 }

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