dorian/test
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects 1 Releases 2 Packages 1 Wiki Activity Actions

merged

Browse source
This commit is contained in:
CodeCrafter912 2018-06-29 20:12:27 +02:00
parent 8c97bfc663
commit 1c4b177219
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

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