Fix

sisteming · sisteming · commit c4ea762c7716 · 2017-03-18T16:30:05.000Z
diff --git a/_includes/svg-icons.html b/_includes/svg-icons.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
           {% if site.footer-links.dribbble %}<a href="http://dribbble.com/{{ site.footer-links.dribbble }}">{% include svg-icons/dribbble.html %}</a>{% endif %}
           {% if site.footer-links.email %}<a href="mailto:{{ site.footer-links.email }}">{% include svg-icons/email.html %}</a>{% endif %}
           {% if site.footer-links.facebook %}<a href="http://facebook.com/{{ site.footer-links.facebook }}">{% include svg-icons/facebook.html %}</a>{% endif %}
@@ -7,11 +6,9 @@
           {% if site.footer-links.instagram %}<a href="http://instagram.com/{{ site.footer-links.instagram }}">{% include svg-icons/instagram.html %}</a>{% endif %}
           {% if site.footer-links.linkedin %}<a href="http://linkedin.com/in/{{ site.footer-links.linkedin }}">{% include svg-icons/linkedin.html %}</a>{% endif %}
           {% if site.footer-links.pinterest %}<a href="http://pinterest.com/{{ site.footer-links.pinterest }}">{% include svg-icons/pinterest.html %}</a>{% endif %}
-          {% if site.footer-links.rss %}<a href="{{ site.baseurl }}/feed.xml">{% include svg-icons/rss.html %}</a>{% endif %}
-          {% if site.footer-links.twitter %}<a href="http://twitter.com/{{ site.footer-links.twitter }}">{% include svg-icons/twitter.html %}</a>{% endif %}
-          {% if site.footer-links.stackoverflow %}<a href="http://stackoverflow.com/{{ site.footer-links.stackoverflow }}">{% include svg-icons/stackoverflow.html %}</a>{% endif %}
-          
-=======
+{% if site.footer-links.rss %}<a href="{{ site.baseurl }}/feed.xml">{% include svg-icons/rss.html %}</a>{% endif %}
+{% if site.footer-links.twitter %}<a href="http://twitter.com/{{ site.footer-links.twitter }}">{% include svg-icons/twitter.html %}</a>{% endif %}
+{% if site.footer-links.stackoverflow %}<a href="http://stackoverflow.com/{{ site.footer-links.stackoverflow }}">{% include svg-icons/stackoverflow.html %}</a>{% endif %}
 {% if site.footer-links.dribbble %}<a href="https://dribbble.com/{{ site.footer-links.dribbble }}"><i class="svg-icon dribbble"></i></a>{% endif %}
 {% if site.footer-links.email %}<a href="mailto:{{ site.footer-links.email }}"><i class="svg-icon email"></i></a>{% endif %}
 {% if site.footer-links.facebook %}<a href="https://www.facebook.com/{{ site.footer-links.facebook }}"><i class="svg-icon facebook"></i></a>{% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -20,13 +20,10 @@
     <div class="wrapper-masthead">
       <div class="container">
         <header class="masthead clearfix">
-<<<<<<< HEAD
           <a href="{{ site.baseurl }}/" class="site-avatar"><img src="{{ site.avatar }}" align="center" valign="center" /></a>
           
-=======
           <a href="{{ site.baseurl }}/" class="site-avatar"><img src="{{ site.avatar }}" /></a>
 
->>>>>>> barryclark/master
           <div class="site-info">
             <h1 class="site-name"><a href="{{ site.baseurl }}/">{{ site.name }}</a></h1>
             <p class="site-description">{{ site.description }}</p>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -20,11 +20,8 @@ <h1>{{ page.title }}</h1>
     Written on {{ page.date | date: "%B %e, %Y" }}
      
   </div>
-<<<<<<< HEAD
   {% include disqus.html disqus_identifier=page.disqus_identifier %}
 </article>
-=======
 
   {% include disqus.html %}
 </article>
->>>>>>> barryclark/master
diff --git a/index.html b/index.html
@@ -10,7 +10,6 @@ <h1><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></h1>
 
       <div class="entry">
         {{ post.content | truncatewords:60}}
-=======
         {{ post.excerpt }}
       </div>
 
