diff options
Diffstat (limited to 'hosted/tmpl')
| -rw-r--r-- | hosted/tmpl/index.html | 5 |
1 files changed, 1 insertions, 4 deletions
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}} |
