Merge branch 'master' into Zweig_Florian

# Conflicts: # Content/hallo.txt
Merge pull request 'änderung' (#4 ) from Branch-Christoph into master
2022-10-04 11:28:13 +02:00 · 2022-10-04 11:20:32 +02:00 · 2022-10-04 11:18:16 +02:00 · 2022-10-04 10:46:25 +02:00 · 2022-10-04 10:41:11 +02:00 · 2022-10-04 10:31:27 +02:00
2 changed files with 10 additions and 1 deletions
--- a/Content/hallo.txt
+++ b/Content/hallo.txt
@ -2,6 +2,13 @@ Toller Text

 Hallihallo

+Neue Änderung
+
 Noch weitere tolle Inhalte.

 Ganz viel andere tolle Inhalte.
+
+
+Noch mehr.
+
+Und noch mehr.
--- a/README.md
+++ b/README.md
@ -1,3 +1,5 @@
 # Git_Playground

-Ausprobieren
+Ausprobieren
+
+Dies ist die verbessrte Beschreibung.
Author	SHA1	Message	Date
Dario Hardmeier	a2d700a18c	Merge branch 'master' into Zweig_Florian # Conflicts: # Content/hallo.txt	2022-10-04 11:28:13 +02:00
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
Florian Leisering	4e1e76dc35	Merge pull request 'Projektbeschrieb-verbessern' (#3 ) from Projektbeschrieb-verbessern into master Reviewed-on: http://10.0.254.95:3000/hardmeidario/Git_Playground/pulls/3	2022-10-04 10:46:25 +02:00
Dario Hardmeier	3ab5299c91	Korrektur	2022-10-04 10:41:11 +02:00
Dario Hardmeier	f841508a84	Content angepasst.	2022-10-04 10:31:27 +02:00
chriguu	0c6824d017	änderung	2022-10-04 10:28:20 +02:00
Dario Hardmeier	737dda05db	Beschreibung verbessert	2022-10-04 10:26:27 +02:00