fix push

data/homepage.yml

@@ -8,12 +8,7 @@ banner:
       link: "#"
       class: "primary"
     - title: "Chatte mit der Community"
-<<<<<<< HEAD
       link: "https://app.matrix.to/#/#freifunk:chat.dezentrale.space"
-=======
-      link: "https://app.element.io/#/room/#freifunk:chat.dezentrale.space"
->>>>>>> 94cb18e3b4df3c6229a2f43856425d38efdb70b1
-
 ### Highlight ###
 highlight:
   enable: true

layouts/partials/header.html

@@ -17,7 +17,7 @@
             {{ end }}
             {{ $button_history := .Site.Data.globalheader.button_history }}
             {{ if $button_history.enable }}
-            <li><a href="{{ $button_calendar.link }}">{{ $button_history.title }}</a></li>
+            <li><a href="{{ $button_history.link }}">{{ $button_history.title }}</a></li>
             {{ end }}
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>