dorian/test
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects 1 Releases 2 Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	README.md
This commit is contained in:
CodeCrafter912 2018-06-29 20:03:20 +02:00
commit 9885d0b214
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

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