From 91c4e3fb3a5d9e86e5fb513bb65da89d4b061b08 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 03 Apr 2022 18:44:33 +0000
Subject: [PATCH] fix: multiline code block #87
---
layouts/partials/contact.html | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/layouts/partials/contact.html b/layouts/partials/contact.html
index 21048b7..7fb991e 100644
--- a/layouts/partials/contact.html
+++ b/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 -}}
- ​<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>
--
Gitblit v1.10.0