aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets/css/creative.css5
-rw-r--r--index.html2
2 files changed, 2 insertions, 5 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%;
diff --git a/index.html b/index.html
index 0f12814..3ec8527 100644
--- a/index.html
+++ b/index.html
@@ -86,7 +86,7 @@
</nav>
<header>
- <div class="header-content"
+ <div class="header-content">
<section class="header-content-inner">
<p><strong>The solutions to all your problems</strong></p>
<hr> <!-- Divider -->