hardmeidario
/
Git_Playground
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.fhgr.ch/hardmeidario/Git_Playground 

# Conflicts:
#	Content/hallo.txt
Flavia_neu
Dario Hardmeier 2022-10-04 10:02:58 +02:00
parent 701e0cf1cf 19c8a6a66e
commit ed326df921
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Content/hallo.txt
View File

@ -1,3 +1,5 @@
Toller Text Toller Text
Hallihallo
Noch weitere tolle Inhalte. Noch weitere tolle Inhalte.