fixed wrong merge

This commit is contained in:
Marek Krug 2025-03-12 16:24:02 +01:00
parent c9da3c1c54
commit 238fdab51c

View file

@ -1,5 +1 @@
<<<<<<< HEAD
--baseURL=https://berlin.ccc.de/
=======
--baseURL=https://berlin.ccc.de/
>>>>>>> staging