diff options
Diffstat (limited to 'hosted/tmpl')
| -rw-r--r-- | hosted/tmpl/index.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hosted/tmpl/index.html b/hosted/tmpl/index.html index c9bf28d..b6b73ef 100644 --- a/hosted/tmpl/index.html +++ b/hosted/tmpl/index.html @@ -24,8 +24,11 @@ {{ template "upcomingTalks" . }} +<<<<<<< HEAD {{ template "pastTalks" . }} +======= +>>>>>>> refs/remotes/origin/master </main> </body> |
