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