fixed wrong merge
This commit is contained in:
parent
c9da3c1c54
commit
238fdab51c
|
@ -1,5 +1 @@
|
|||
<<<<<<< HEAD
|
||||
--baseURL=https://berlin.ccc.de/
|
||||
=======
|
||||
--baseURL=https://berlin.ccc.de/
|
||||
>>>>>>> staging
|
||||
|
|
Loading…
Reference in a new issue