cleanup
This commit is contained in:
		@@ -2,14 +2,6 @@
 | 
				
			|||||||
<div id="contact_buttons">
 | 
					<div id="contact_buttons">
 | 
				
			||||||
    <footer>
 | 
					    <footer>
 | 
				
			||||||
        <p>Made by {{ $.Site.Data.config.name }} using <a href="https://github.com/jackyzha0/quartz">Quartz</a>, © {{ dateFormat "2006" now }}</p>
 | 
					        <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 -}}
 | 
					 | 
				
			||||||
        ​<a href="{{.link}}">{{.link_name}}</a>
 | 
					 | 
				
			||||||
        {{- end -}}
 | 
					 | 
				
			||||||
=======
 | 
					 | 
				
			||||||
        <ul>
 | 
					        <ul>
 | 
				
			||||||
            {{ if not .IsHome }}
 | 
					            {{ if not .IsHome }}
 | 
				
			||||||
            <li><a href="/">Home</a></li>
 | 
					            <li><a href="/">Home</a></li>
 | 
				
			||||||
@@ -18,6 +10,5 @@
 | 
				
			|||||||
            <li><a href="{{.link}}">{{.link_name}}</a></li>
 | 
					            <li><a href="{{.link}}">{{.link_name}}</a></li>
 | 
				
			||||||
            {{- end -}}
 | 
					            {{- end -}}
 | 
				
			||||||
        </ul>
 | 
					        </ul>
 | 
				
			||||||
>>>>>>> Stashed changes
 | 
					 | 
				
			||||||
    </footer>
 | 
					    </footer>
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user