This commit is contained in:
CodeCrafter912 2018-06-29 20:12:27 +02:00
parent 8c97bfc663
commit 1c4b177219

View file

@ -5,7 +5,5 @@ hallo2
auch hallo
test
zuppa
<<<<<<< HEAD
nochmal zuppa
=======
>>>>>>> 1223f4ad4a01f1766b1836cf6a248fb102154372
tohl