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

Both
2025-02-21 16:05:36 +01:00 · 2025-02-21 16:05:32 +01:00 · 2025-02-21 16:05:10 +01:00
1 changed files with 0 additions and 3 deletions
--- a/3
+++ b/3
@@ -1,7 +1,4 @@
 moin 
-<<<<<<< HEAD

 moin
-=======
 servus 
->>>>>>> dd4a6975ea164813267f1c744dfcab6c754534bc
Author	SHA1	Message	Date
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
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
Jonas Kieninger	6bf6c39d7b	Both	2025-02-21 16:05:10 +01:00