From 8bb75f306847e2a58ee98ef23e4b87681c74d887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 13 Feb 2015 08:17:42 +0100
Subject: [PATCH] Fix wrong button merge

---
 app/styles/components/buttons.scss | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss
index b8755325..a7e371e5 100755
--- a/app/styles/components/buttons.scss
+++ b/app/styles/components/buttons.scss
@@ -87,7 +87,6 @@
         background: $red;
         color: $white;
     }
-<<<<<<< HEAD
     .icon {
         color: $white;
     }
@@ -100,8 +99,6 @@
         background: $red-light;
         color: $white;
     }
-=======
->>>>>>> Desfault button refactor
 }
 
 .button-bulk {
@@ -116,8 +113,6 @@
     }
 }
 
-<<<<<<< HEAD
-
 .button-auth {
     @extend %button;
     background: $grayer;
@@ -125,12 +120,6 @@
     img {
         @extend %large;
         color: $white;
-=======
-.button-auth {
-    @extend %button;
-    background: $grayer;
-    .icon {
->>>>>>> Desfault button refactor
         margin-right: .5rem;
     }
     &:hover {