Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch

doch nicht
2025-02-21 16:23:27 +01:00 · 2025-02-21 16:22:48 +01:00 · 2025-02-21 16:21:10 +01:00 · 2025-02-21 16:19:14 +01:00 · 2025-02-21 16:17:12 +01:00 · 2025-02-21 16:16:38 +01:00
7 changed files with 4 additions and 35 deletions
--- a/1
+++ b/1
@@ -1 +0,0 @@
 ich bin Leo
--- a/2
+++ b/2
@@ -1,3 +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
+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
@@ -0,0 +1 @@
 Hallo
--- a/23
+++ b/23
@@ -1,23 +0,0 @@
 Schreibgeschützt
 So schreibgeschützt ist das gar nicht
 :(
 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/9
+++ b/9
@@ -1,9 +0,0 @@
 moin 
 servus 
 moin
 moin
 =======
 servus 
--- a/stefan.md
+++ b/stefan.md
--- a/tifla.txt
+++ b/tifla.txt
@@ -1 +1,2 @@
-Test
+test 
 ädnerung
Author	SHA1	Message	Date
DanielV	f96ad6d4d0	Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch	2025-02-21 16:23:27 +01:00
DanielV	6514c058b1	Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch	2025-02-21 16:22:48 +01:00
Jonas Kieninger	abf8f58db5	doch nicht	2025-02-21 16:21:10 +01:00
Jonas Kieninger	e146686ee1	Lets play	2025-02-21 16:19:14 +01:00
Stefan Möller	40ca9a520a	Merge branch 'feature/stefan'	2025-02-21 16:17:12 +01:00
Mike Teufel	e4023db286	gelöscht	2025-02-21 16:16:38 +01:00
Mike Teufel	cf05e2a64a	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:15:29 +01:00
Mike Teufel	c25845de1d	hallo	2025-02-21 16:15:21 +01:00
Stefan Möller	8d4abb7b4e	create stefan file	2025-02-21 16:13:34 +01:00
Tim Flaig	59951f5dfc	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:13:11 +01:00
Jonas Kieninger	0562430628	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:12:42 +01:00
Janek Schultes	c7bc9db676	test	2025-02-21 16:12:26 +01:00
Jonas Kieninger	b8b59759be	Ich will hier aus	2025-02-21 16:12:20 +01:00
Tim Flaig	017ef4e4e5	Änderung	2025-02-21 16:11:56 +01:00
Jonas Kieninger	841478c4cc	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:11:41 +01:00
Jonas Kieninger	88f943991f	Wunschliste	2025-02-21 16:11:02 +01:00
Jonas Kieninger	50c82c778f	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:10:32 +01:00
Tim Flaig	30693bb53c	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:08:33 +01:00
Luis Thiel	bc88afc9f4	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:08:08 +01:00
Mike Teufel	6e8d6516b3	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:07:57 +01:00
Luis Thiel	edbc58f29c	neu	2025-02-21 16:07:54 +01:00
Mike Teufel	80052d6f28	Halllo	2025-02-21 16:07:49 +01:00
Tim Flaig	ef4f3c58ed	Änderung	2025-02-21 16:07:19 +01:00
Jonas Kieninger	3cc458995e	Wunschliste	2025-02-21 16:07:13 +01:00
Ann-Katrin Binder	7ae4b73760	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:59 +01:00
Ann-Katrin Binder	237ed837db	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:34 +01:00
Ann-Katrin Binder	0304959f4c	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:21 +01:00
Ann-Katrin Binder	cd09fa826a	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:02 +01:00
Ann-Katrin Binder	a75b95c18d	new commit	2025-02-21 16:05:53 +01:00