merged
This commit is contained in:
parent
8c97bfc663
commit
1c4b177219
1 changed files with 1 additions and 3 deletions
|
@ -5,7 +5,5 @@ hallo2
|
|||
auch hallo
|
||||
test
|
||||
zuppa
|
||||
<<<<<<< HEAD
|
||||
nochmal zuppa
|
||||
=======
|
||||
>>>>>>> 1223f4ad4a01f1766b1836cf6a248fb102154372
|
||||
tohl
|
||||
|
|
Loading…
Reference in a new issue