Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
This commit is contained in:
CodeCrafter912 2018-06-29 20:03:20 +02:00
commit 9885d0b214

View file

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