diff options
| author | hanemile <mail@emile.space> | 2020-07-19 16:51:20 +0200 |
|---|---|---|
| committer | hanemile <mail@emile.space> | 2020-07-19 16:51:20 +0200 |
| commit | 6cf9eb0de1f6a4bee6655ada346f96d4ae5c21af (patch) | |
| tree | 22cd361727f2d14f5fc4ac4925397947ccb77af3 /hosted | |
| parent | ba9b3dfae3166406fa759b1c52909c12b47d09fc (diff) | |
removed merge conflicts
Diffstat (limited to 'hosted')
| -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}} |
