From 0e8e96f67e38553f1c299b8ae532e4c871eeb8ea Mon Sep 17 00:00:00 2001
From: Anon Ray <rayanon004@gmail.com>
Date: Mon, 24 Mar 2014 20:45:33 +0530
Subject: [PATCH] Fix conflict characters in main.css

---
 mouchak/static/css/main.css |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/mouchak/static/css/main.css b/mouchak/static/css/main.css
index ffe3649..f574fb5 100644
--- a/mouchak/static/css/main.css
+++ b/mouchak/static/css/main.css
@@ -73,15 +73,11 @@ hr {
     margin-top: 5%;
 }
 
-<<<<<<< HEAD
- a, a:hover, a:active {
-=======
 #main-icons {
   margin-top: 30px;
 }
 
 a, a:hover, a:active{
->>>>>>> 5c07767178533711f1d76ca6b19129a8da67fb9f
     color:#262525;
 }
 /*.navbar-default {
-- 
1.7.10.4