This commit is contained in:
CodeCrafter912 2018-06-29 20:04:36 +02:00
parent 9885d0b214
commit 144998385a

View file

@ -2,8 +2,5 @@ Thgis is a test Repo for educational purposes
test test
hallo<br> hallo<br>
hallo2 hallo2
<<<<<<< HEAD
auch hallo auch hallo
=======
test test
>>>>>>> origin/master