From 1cb61b706b5b1efa29402a1a194a663ee39174a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20B=C3=B6hm?= <alexander.boehm@malbolge.net>
Date: Fri, 24 Nov 2023 12:32:54 +0100
Subject: [PATCH] Fix

---
 content/dezentrale.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/content/dezentrale.md b/content/dezentrale.md
index ec1cbd1..4c7f9d5 100644
--- a/content/dezentrale.md
+++ b/content/dezentrale.md
@@ -90,11 +90,7 @@ Vorort in der [
 \
 \
 Den Vorstand unter der E-Mail-Adresse \
-<<<<<<< HEAD
-{{< value "mail" "vorstand" >}}
-=======
 {{< value "mail" "vorstand" >}} [(PGP-Key)]({{< value "mail" "vorstand_pgp_url" >}})
->>>>>>> 428d387 (Added PGP key and related information)
 
 {{< /page_col >}}
 {{< page_col centered >}}