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

127 B

Thgis is a test Repo for educational purposes test hallo
hallo2 <<<<<<< HEAD auch hallo

test

origin/master