From 8ad0df123cb3fe148930ef2f083302ac4acfa333 Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Mon, 20 Apr 2015 21:04:08 -0300
Subject: [PATCH] fix conflit

---
 sass/proposal_detail/_proposal-detail-base.scss | 4 ----
 1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/sass/proposal_detail/_proposal-detail-base.scss b/sass/proposal_detail/_proposal-detail-base.scss
index d4c9357..6be8fdd 100644
--- a/sass/proposal_detail/_proposal-detail-base.scss
+++ b/sass/proposal_detail/_proposal-detail-base.scss
@@ -1,9 +1,5 @@
 @each $category, $color in $categories {
-<<<<<<< HEAD
-  .#{$category} {
-=======
   .#{$category} .proposal-detail-base {
->>>>>>> c9ef3706dcfc94f2fb21b61a8636092fdf00ed03
     font-family: 'Open Sans', sans-serif;
     font-size: 16px;
     font-weight: 300;
--
libgit2 0.21.2