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

Compare commits

base: hardmeidario:6a0d990d8db551f931ae037e485106ec1a40ffe7
Branches Tags
hardmeidario:master
hardmeidario:Zweig_Florian
hardmeidario:Branch-Christoph
hardmeidario:player_walking_animation
hardmeidario:Projektbeschrieb-verbessern
hardmeidario:test
hardmeidario:pr/4
hardmeidario:marlon-aenderung
hardmeidario:Flavia_neu
hardmeidario:Dario_Second_Branch
hardmeidario:Dario_Branch
..
compare: hardmeidario:41d90a75d3cd93b18ff28888bd7db548977e6ecc
Branches Tags
hardmeidario:master
hardmeidario:Zweig_Florian
hardmeidario:Branch-Christoph
hardmeidario:player_walking_animation
hardmeidario:Projektbeschrieb-verbessern
hardmeidario:test
hardmeidario:pr/4
hardmeidario:marlon-aenderung
hardmeidario:Flavia_neu
hardmeidario:Dario_Second_Branch
hardmeidario:Dario_Branch

3 Commits
6a0d990d8d ... 41d90a75d3

Author SHA1 Message Date
Dario Hardmeier
41d90a75d3 Merge pull request 'ÄNDERUNG' (#5) from Zweig_Florian into master 
Reviewed-on: http://10.0.254.95:3000/hardmeidario/Git_Playground/pulls/5
 2022-10-04 11:28:49 +02:00
Dario Hardmeier
a2d700a18c Merge branch 'master' into Zweig_Florian 
# Conflicts:
#	Content/hallo.txt
 2022-10-04 11:28:13 +02:00
Florian
02212cf4e8 ÄNDERUNG 2022-10-04 10:28:31 +02:00
1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
Content/hallo.txt
View File

@ -2,13 +2,13 @@ Toller Text
Hallihallo Hallihallo
Neue Änderung
Noch weitere tolle Inhalte. Noch weitere tolle Inhalte.
Ganz viel andere tolle Inhalte.
Neue Änderung
Noch mehr. Noch mehr.
Und noch mehr. Und noch mehr.