aboutsummaryrefslogtreecommitdiff
path: root/assets/css/creative.css
diff options
context:
space:
mode:
authorHumairAK <humair88@hotmail.com>2016-07-13 09:12:52 +0000
committerHumairAK <humair88@hotmail.com>2016-07-13 09:12:52 +0000
commit0e9c374c0b4d3e0f3c4f8c695087ca3bb0ac978f (patch)
tree699bdc27cb10ce0e04a93f807a06866c50ca450e /assets/css/creative.css
parent4797d1ff9ef4ef35306750dd2bb8c259519d222d (diff)
fixed a bug
Diffstat (limited to 'assets/css/creative.css')
-rw-r--r--assets/css/creative.css5
1 files changed, 1 insertions, 4 deletions
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%;