From d069cecc9b82b2cd2dcd81b90f229c7ffc0d7793 Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Wed, 3 Dec 2014 09:00:05 -0500
Subject: [PATCH] fixed unfound merge conflict

---
 app/assets/stylesheets/uservoice.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/stylesheets/uservoice.css b/app/assets/stylesheets/uservoice.css
index b408aa10..0ec92140 100644
--- 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;