cccb-website-team/www
1
1
Fork 1
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fixed wrong merge

Browse source
This commit is contained in:
Marek Krug 2025-03-12 16:24:02 +01:00
parent c9da3c1c54
commit 238fdab51c
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.hugo-params
View file

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