fixing conflick markers

diff --git a/home.php b/home.php
index 849ead9..0529ea9 100644 (file)
--- a/home.php
+++ b/home.php
@@ -122,11 +122,5 @@ if ( 'page' == get_option('show_on_front') && get_option('page_for_posts') && is
             ?>
         </ul>
     </div>
-<<<<<<< HEAD
-    <div>
-        <img src="<?php bloginfo('template_url'); ?>/assets/dotted-line.jpg">
-    </div>
-=======
 </div>
->>>>>>> release/1.0
         <?php get_footer(); ?>

diff --git a/scss/_structure.scss b/scss/_structure.scss
index b718e28..20730ed 100644 (file)
--- a/scss/_structure.scss
+++ b/scss/_structure.scss
@@ -500,10 +500,7 @@ footer #part p {
 }
 #copyright {
     padding: 5px 20px;
-<<<<<<< HEAD
-=======
     font-family: Times New Roman, sans-serif;
->>>>>>> release/1.0
     p, a {
     color: white;
     }
@@ -780,22 +777,6 @@ aside.left-off-canvas-menu ul.open {
     .date {
         font-size: 12px;
     }
-<<<<<<< HEAD
-    .search-result-header {
-        margin: 20px;
-    }
-    #blog-side-info {
-        border-left: 1px solid grey;
-        padding-left: 20px;
-        margin-top: 30px;
-        ul {
-            columns: 1;
-            -moz-columns: 1;
-            -webkit-columns: 1;
-        }
-    }
-    /* End Blog & Search */
-=======
 
     footer.entry-meta {
         color: #757575;
@@ -835,7 +816,6 @@ aside.left-off-canvas-menu ul.open {
 }
 
 /* End Blog & Search */
->>>>>>> release/1.0
     
     
     
@@ -891,91 +871,9 @@ aside.left-off-canvas-menu ul.open {
 }
 /* End Ninja Forms */
 
-<<<<<<< HEAD
-/* Locations Map */
-#map {
-    background: url("../airpark.jpg") no-repeat scroll left top #fff;
-    font-family: arial,helvetica,sans-serif;
-    font-size: 8pt;
-    height: 544px;
-    position: relative;
-    width: 673px;
-}
-#map li {
-    list-style: outside none none;
-    margin: 0;
-    padding: 0;
-}
-#map li a {
-    background: url("../blank.gif") repeat scroll 0 0 rgba(0, 0, 0, 0);
-    border: medium none;
-    display: block;
-    position: relative;
-}
-#map li a span {
-    display: none;
-}
-#map li a:hover span {
-    background: none repeat scroll 0 0 #fff;
-    border: 1px solid #000;
-    color: #000;
-    display: block;
-    left: 20px;
-    padding: 5px;
-    text-decoration: none;
-    top: 20px;
-    width: 120px;
-}
-#map a.bldg110 {
-    background: none repeat scroll 0 0 transparent;
-    height: 8px;
-    left: 310px;
-    position: absolute;
-    top: 220px;
-    width: 8px;
-}
-#map a.bldg227 {
-    background: none repeat scroll 0 0 transparent;
-    height: 8px;
-    left: 205px;
-    position: absolute;
-    top: 98px;
-    width: 8px;
-}
-#map a.bldg232 {
-    background: none repeat scroll 0 0 transparent;
-    height: 8px;
-    left: 208px;
-    position: absolute;
-    top: 109px;
-    width: 8px;
-}
-#map a.bldg421 {
-    background: none repeat scroll 0 0 transparent;
-    height: 8px;
-    left: 530px;
-    position: absolute;
-    top: 286px;
-    width: 8px;
-}
-#map a.coop {
-    height: 30px;
-    left: 108px;
-    position: absolute;
-    top: 225px;
-    width: 30px;
-}
-/* */
-
-=======
->>>>>>> release/1.0
 /* For fixing cellphones not showing phone numbers because of goofy auto-coloring */
 a[href^=tel]{
     color:inherit;
     text-decoration:none;
-<<<<<<< HEAD
-}
-=======
 }
 /* */
->>>>>>> release/1.0