hahaha

Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch
changed readme
2025-02-21 16:07:41 +01:00 · 2025-02-21 16:06:41 +01:00 · 2025-02-21 16:03:54 +01:00
7 changed files with 3 additions and 5 deletions
--- a/1
+++ b/1
@@ -1,2 +1 @@
 ich bin Leo
-ich nicht 
--- a/binder.txt
+++ b/binder.txt
@@ -1 +0,0 @@
-Hallo
--- a/1
+++ b/1
@@ -0,0 +1 @@
+hihihi
--- a/1
+++ b/1
@@ -21,4 +21,3 @@ can not confirm
 Benutzer: Admin
 Passwort: Passwort123456
 >>>>>>> 829eebcc9143e352a3e3212eb825e99ba0f8be4c
-Was sollen diese dinge 
--- a/readme.md
+++ b/readme.md
@@ -1,2 +1,3 @@
 DAS IST EINE README
+hehehe hab den branch geändert
 Okay 
--- a/stefan.md
+++ b/stefan.md
--- a/tifla.txt
+++ b/tifla.txt
@@ -1,2 +1 @@
-Test
-Änderung
+Test
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
DanielV	d5d9f19ade	changed readme	2025-02-21 16:03:54 +01:00