diff --git a/layouts/partials/head.html b/layouts/partials/head.html index c00105de..a85527db 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -35,7 +35,13 @@ +<<<<<<< HEAD {{ template "_internal/opengraph.html" . }} {{ template "_internal/twitter_cards.html" . }} +======= + + + +>>>>>>> 789501f (chronik first try) diff --git a/layouts/schulchronik/single.html b/layouts/schulchronik/single.html index 455195cc..15d56f58 100644 --- a/layouts/schulchronik/single.html +++ b/layouts/schulchronik/single.html @@ -4,6 +4,10 @@