Merge pull request 'ÄNDERUNG' (#5 ) from Zweig_Florian into master

Reviewed-on: http://10.0.254.95:3000/hardmeidario/Git_Playground/pulls/5
Merge branch 'master' into Zweig_Florian
2022-10-04 11:28:49 +02:00 · 2022-10-04 11:28:13 +02:00 · 2022-10-04 10:28:31 +02:00
1 changed files with 3 additions and 3 deletions
--- a/Content/hallo.txt
+++ b/Content/hallo.txt
@ -2,13 +2,13 @@ Toller Text

 Hallihallo

+Neue Änderung
+
 Noch weitere tolle Inhalte.

-
-Neue Änderung
+Ganz viel andere tolle Inhalte.


 Noch mehr.

 Und noch mehr.
-
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