cleanup

layouts/partials/contact.html

@@ -2,14 +2,6 @@
 <div id="contact_buttons">
     <footer>
         <p>Made by {{ $.Site.Data.config.name }} using <a href="https://github.com/jackyzha0/quartz">Quartz</a>, © {{ dateFormat "2006" now }}</p>
-<<<<<<< Updated upstream
-        {{ if not .IsHome }}
-        <a href="/">Home</a>
-        {{end}}
-        {{- range $.Site.Data.config.links -}}
-        &ZeroWidthSpace;<a href="{{.link}}">{{.link_name}}</a>
-        {{- end -}}
-=======
         <ul>
             {{ if not .IsHome }}
             <li><a href="/">Home</a></li>
@@ -18,6 +10,5 @@
             <li><a href="{{.link}}">{{.link_name}}</a></li>
             {{- end -}}
         </ul>
->>>>>>> Stashed changes
     </footer>
 </div>