Merge branch 'branch2'

Merge branch 'LeosBranch'
neuen Änderung
2025-02-21 16:48:51 +01:00 · 2025-02-21 16:46:33 +01:00 · 2025-02-21 16:45:25 +01:00 · 2025-02-21 16:43:05 +01:00 · 2025-02-21 16:42:57 +01:00 · 2025-02-21 16:38:35 +01:00
3 changed files with 9 additions and 1 deletions
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
 ___     ___     ___     ___     ___     ___     ___     ___     ___     ___     ___     ___     ___     ___     ___     ___
 |   |___|   |___|   |___|   |___|   |___|   |___|   |___|   |___|   |___|   |___|   |___|   |___|   |___|   |___|   |___|   |___
--- a/4
+++ b/4
@@ -1 +1,5 @@
 hihihi
 hlhlhl
 __    __    __
  \__/  \__/  \__
--- a/tifla.txt
+++ b/tifla.txt
@@ -1,3 +1,5 @@
 test 
 ädnerung
 test
 ädnerung
Author	SHA1	Message	Date
Tim Flaig	66feb2793a	Merge branch 'branch2'	2025-02-21 16:48:51 +01:00
Leo Schlegel	18b3391a3e	Merge branch 'LeosBranch'	2025-02-21 16:46:33 +01:00
Tim Flaig	f2f7758e95	neuen Änderung	2025-02-21 16:45:25 +01:00
Mike Teufel	516e3a5bfc	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:43:05 +01:00
Mike Teufel	8353291ee4	test	2025-02-21 16:42:57 +01:00
Jonas Kieninger	6cba59943b	hahaha	2025-02-21 16:38:35 +01:00
Jonas Kieninger	80806f1b93	hahaha	2025-02-21 16:38:09 +01:00
		`@@ -0,0 +1,2 @@`
							`___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___`
							`\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___\| \|___`