From 2384ebcf2557345ce465c45aacd069401f6cc710 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 15 Feb 2016 10:50:06 -0500
Subject: [PATCH] Fix rebase

---
 src/css/main.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/css/main.css b/src/css/main.css
index 649380454..773895d46 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1379,7 +1379,6 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   }
 }
 
-<<<<<<< a4ed15ab6f9cb6ec415196f24ddee81005a8f3d6
 /* Confirmation popup */
 
 .confirmTxModal {