From 14a19b72d3880bf979829087bbcac5fb8170f437 Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Fri, 17 Apr 2015 14:09:20 -0300
Subject: [PATCH] fix conflit with proposal_categories file

---
 sass/_proposal_categories.scss | 8 --------
 1 file changed, 0 insertions(+), 8 deletions(-)

diff --git a/sass/_proposal_categories.scss b/sass/_proposal_categories.scss
index e1fdcda..520fea6 100644
--- a/sass/_proposal_categories.scss
+++ b/sass/_proposal_categories.scss
@@ -74,20 +74,12 @@
     font-size: 18pt;
     font-weight: bold;  
     text-decoration: none;
-<<<<<<< HEAD
-    background: #fff;  
-=======
->>>>>>> 450d03f922b650755bff80ce172cd13d76d06632
   }
 
   .proposal-item {
     width: 46%;
     height: 134px;
-<<<<<<< HEAD
-    margin: 10px 30px;
-=======
     margin: 0.5%;
->>>>>>> 450d03f922b650755bff80ce172cd13d76d06632
     background: #fff;
     border-radius: 5px;
     padding: 15px;
--
libgit2 0.21.2