From 0e9c374c0b4d3e0f3c4f8c695087ca3bb0ac978f Mon Sep 17 00:00:00 2001
From: HumairAK <humair88@hotmail.com>
Date: Wed, 13 Jul 2016 05:12:52 -0400
Subject: fixed a bug

---
 assets/css/creative.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'assets')

diff --git a/assets/css/creative.css b/assets/css/creative.css
index f36128c..3d00fb7 100644
--- a/assets/css/creative.css
+++ b/assets/css/creative.css
@@ -127,14 +127,11 @@ footer .navbar-default .affix .nav>li>a:focus {
     color: #222;
 }
 
-<<<<<<< HEAD
+
 @media(min-width:768px) {
    
 }
 
-
-=======
->>>>>>> 952f7cefcd35550bb0930418e56c524f09eca92d
 header {
     position: relative;
     width: 100%;
-- 
cgit v1.2.3