Merge pull request 'änderung' (#4 ) from Branch-Christoph into master

Reviewed-on: http://10.0.254.95:3000/hardmeidario/Git_Playground/pulls/4 OK
Merge branch 'master' into Branch-Christoph
2022-10-04 11:20:32 +02:00 · 2022-10-04 11:18:16 +02:00 · 2022-10-04 10:28:20 +02:00
1 changed files with 3 additions and 0 deletions
--- a/Content/hallo.txt
+++ b/Content/hallo.txt
@ -5,6 +5,9 @@ Hallihallo
 Noch weitere tolle Inhalte.


+Neue Änderung
+
+
 Noch mehr.

 Und noch mehr.
Author	SHA1	Message	Date
Dario Hardmeier	6a0d990d8d	Merge pull request 'änderung' (#4 ) from Branch-Christoph into master Reviewed-on: http://10.0.254.95:3000/hardmeidario/Git_Playground/pulls/4 OK	2022-10-04 11:20:32 +02:00
chriguu	4614190efb	Merge branch 'master' into Branch-Christoph # Conflicts: # Content/hallo.txt	2022-10-04 11:18:16 +02:00
chriguu	0c6824d017	änderung	2022-10-04 10:28:20 +02:00