Merge branch 'master' of https://gitea.fhgr.ch/hardmeidario/Git_Playground
# Conflicts: # Content/hallo.txt
This commit is contained in:
commit
ed326df921
@ -1,3 +1,5 @@
|
||||
Toller Text
|
||||
|
||||
Noch weitere tolle Inhalte.
|
||||
Hallihallo
|
||||
|
||||
Noch weitere tolle Inhalte.
|
||||
|
Loading…
x
Reference in New Issue
Block a user