test/README.md
CodeCrafter912 9885d0b214 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
2018-06-29 20:03:20 +02:00

9 lines
127 B
Markdown

Thgis is a test Repo for educational purposes
test
hallo<br>
hallo2
<<<<<<< HEAD
auch hallo
=======
test
>>>>>>> origin/master