hahaha

Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch
Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis
2025-02-21 16:07:41 +01:00 · 2025-02-21 16:06:41 +01:00 · 2025-02-21 16:06:32 +01:00 · 2025-02-21 16:06:33 +01:00 · 2025-02-21 16:06:29 +01:00 · 2025-02-21 16:06:23 +01:00
9 changed files with 28 additions and 2 deletions
--- a/Benni.txt
+++ b/Benni.txt
@@ -1,2 +1,3 @@
 Peter Pan!
 Halloooooo
 Hallo
--- a/King.txt
+++ b/King.txt
--- a/Test1/Test123
+++ b/Test1/Test123
--- a/2
+++ b/2
@@ -1 +1,3 @@
 Hello there!
 Berlin was geht ab, seid ihr gut drauf oder was?
 https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=&cad=rja&uact=8&ved=2ahUKEwjviNaOhdWLAxVM_rsIHT3QMxgQFnoECAgQAQ&url=https%3A%2F%2Fshellshock.io%2F&usg=AOvVaw1UtRPAotjoyk_8j87013cz&opi=89978449
--- a/binder.txt
+++ b/binder.txt
--- a/1
+++ b/1
@@ -0,0 +1 @@
 hihihi
--- 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/8
+++ b/8
@@ -1 +1,9 @@
 moin 
 servus 
 moin
 moin
 =======
 servus
Author	SHA1	Message	Date
DanielV	f6a1c68a7b	hahaha	2025-02-21 16:07:41 +01:00
DanielV	e8d2d69091	Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch	2025-02-21 16:06:41 +01:00
Leo Schlegel	4ed3855858	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:32 +01:00
AdrianSommer	ede8449854	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:33 +01:00
AdrianSommer	a314ad9e2a	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:29 +01:00
Leo Schlegel	bcffd6dc97	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:23 +01:00
Leo Schlegel	9ffbe5d740	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:20 +01:00
Daniel King	de7729d3d8	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:19 +01:00
AdrianSommer	0c2e8e74da	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:17 +01:00
Mike Teufel	f3949cfa07	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:12 +01:00
Mike Teufel	d6f11abca2	?	2025-02-21 16:06:04 +01:00
e23006	40f6df15cf	wieder da	2025-02-21 15:06:02 +00:00
Daniel King	5b89079238	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:02 +01:00
Leo Schlegel	a7677c7ea9	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:05:58 +01:00
AdrianSommer	0aa9c2ab4b	Shellshocker lets go	2025-02-21 16:05:55 +01:00
Jonas Kieninger	79848e3d67	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:05:36 +01:00
e23006	5ab54fbf49	Hallo	2025-02-21 15:05:37 +00:00
Jonas Kieninger	a45d88f580	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:05:32 +01:00
Daniel King	cda79e15cc	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:05:27 +01:00
Daniel King	f13e43167b	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:05:17 +01:00
Jonas Kieninger	6bf6c39d7b	Both	2025-02-21 16:05:10 +01:00
Mike Teufel	5f895fc4e8	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:05:03 +01:00
Leo Schlegel	7ebfcf48cd	moin	2025-02-21 16:04:54 +01:00
e23006	1626de32b7	Alles weg	2025-02-21 15:04:52 +00:00
Mike Teufel	567e7a5309	Neuer Ordner mit File	2025-02-21 16:04:52 +01:00
Daniel King	b9795bb86a	Hallo Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:04:34 +01:00
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
Daniel King	6370ce8904	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch. Lines starting with '#' will be ignored, and an empty message aborts	2025-02-21 16:01:35 +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
Daniel King	145ba1fd44	KingCommit	2025-02-21 16:00:21 +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
`@@ -1,2 +1,3 @@`
	`das ist ein test`	`das ist ein test`

		`das ist noch ein test`