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