From 6cf9eb0de1f6a4bee6655ada346f96d4ae5c21af Mon Sep 17 00:00:00 2001
From: hanemile <mail@emile.space>
Date: Sun, 19 Jul 2020 16:51:20 +0200
Subject: removed merge conflicts

---
 hosted/tmpl/index.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'hosted')

diff --git a/hosted/tmpl/index.html b/hosted/tmpl/index.html
index b6b73ef..eaeb83a 100644
--- a/hosted/tmpl/index.html
+++ b/hosted/tmpl/index.html
@@ -24,13 +24,10 @@
 
             {{ template "upcomingTalks" . }}
 
-<<<<<<< HEAD
             {{ template "pastTalks" . }}
 
-=======
->>>>>>> refs/remotes/origin/master
         </main>
     </body>
 
 </html>
-{{end}}
\ No newline at end of file
+{{end}}
-- 
cgit 1.4.1