wer
This commit is contained in:
parent
9885d0b214
commit
144998385a
1 changed files with 0 additions and 3 deletions
|
@ -2,8 +2,5 @@ Thgis is a test Repo for educational purposes
|
|||
test
|
||||
hallo<br>
|
||||
hallo2
|
||||
<<<<<<< HEAD
|
||||
auch hallo
|
||||
=======
|
||||
test
|
||||
>>>>>>> origin/master
|
||||
|
|
Loading…
Reference in a new issue