From 238fdab51ca709e44c6193fa38ff05446030299e Mon Sep 17 00:00:00 2001
From: Marek Krug <git-mail@marekkrug.de>
Date: Wed, 12 Mar 2025 16:24:02 +0100
Subject: [PATCH] fixed wrong merge

---
 .hugo-params | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.hugo-params b/.hugo-params
index 2ef16a1..10e707e 100644
--- a/.hugo-params
+++ b/.hugo-params
@@ -1,5 +1 @@
-<<<<<<< HEAD
 --baseURL=https://berlin.ccc.de/
-=======
---baseURL=https://berlin.ccc.de/
->>>>>>> staging