Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis

2025-02-21 16:04:33 +01:00 · 2025-02-21 16:04:29 +01:00 · 2025-02-21 16:03:56 +01:00 · 2025-02-21 16:03:52 +01:00 · 2025-02-21 16:03:15 +01:00 · 2025-02-21 16:03:10 +01:00
5 changed files with 22 additions and 1 deletions
--- a/3
+++ b/3
@@ -1 +1,2 @@
-Hello there!
+Hello there!
+Berlin was geht ab, seid ihr gut drauf oder was?
--- a/binder.txt
+++ b/binder.txt
--- a/1
+++ b/1
@@ -1,2 +1,3 @@
 das ist ein test

+das ist noch ein test
--- a/13
+++ b/13
@@ -8,3 +8,16 @@ So schreibgeschützt ist das gar nicht
 Hier ist gar nichts schreibgeschützt:)

 0 von 5 Sterne 
+0 von 5 Sterne 
+
+<<<<<<< HEAD
+is ja mal mega langweilig
+=======
+can not confirm
+<<<<<<< HEAD
+>>>>>>> dd4a6975ea164813267f1c744dfcab6c754534bc
+=======
+
+Benutzer: Admin
+Passwort: Passwort123456
+>>>>>>> 829eebcc9143e352a3e3212eb825e99ba0f8be4c
--- a/6
+++ b/6
@@ -1 +1,7 @@
 moin 
+<<<<<<< HEAD
+
+moin
+=======
+servus 
+>>>>>>> dd4a6975ea164813267f1c744dfcab6c754534bc
Author	SHA1	Message	Date
AdrianSommer	48d3a7176a	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:04:33 +01:00
AdrianSommer	250e781382	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:04:29 +01:00
Jonas Kieninger	74650634d6	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:03:56 +01:00
Jonas Kieninger	c0f4fa1ff7	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:03:52 +01:00
AdrianSommer	bbaa59d2f2	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:03:15 +01:00
Mike Teufel	829eebcc91	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:03:10 +01:00
AdrianSommer	994fea67aa	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:03:05 +01:00
Mike Teufel	8e72bc9cdf	test	2025-02-21 16:03:01 +01:00
Ann-Katrin Binder	03649c7c29	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:02:40 +01:00
AdrianSommer	8ffd205515	blabla	2025-02-21 16:02:22 +01:00
Jonas Kieninger	5e00d0f273	Okay	2025-02-21 16:02:20 +01:00
e23007	dd4a6975ea	adrian_s aktualisiert	2025-02-21 15:02:18 +00:00
Leo Schlegel	20d0c8f925	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:02:04 +01:00
Leo Schlegel	ebd54a0776	ka	2025-02-21 16:01:55 +01:00
Mike Teufel	75555c2912	test	2025-02-21 16:01:47 +01:00
Ann-Katrin Binder	7fba557825	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:01:38 +01:00
Ann-Katrin Binder	eb2b297ba4	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:00:55 +01:00
Ann-Katrin Binder	77f783de9b	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:00:15 +01:00
Ann-Katrin Binder	8bc2b1dc47	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 15:59:01 +01:00
Ann-Katrin Binder	2790b70f94	annkatrin commit	2025-02-21 15:57:05 +01:00