Test Änderung

Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis
2025-02-21 16:22:36 +01:00 · 2025-02-21 16:13:11 +01:00 · 2025-02-21 16:12:42 +01:00 · 2025-02-21 16:12:26 +01:00 · 2025-02-21 16:12:20 +01:00 · 2025-02-21 16:11:56 +01:00
8 changed files with 8 additions and 11 deletions
--- a/Benni.txt
+++ b/Benni.txt
@@ -1,2 +1,3 @@
 Peter Pan!
 Halloooooo
+Hallo
--- a/King.txt
+++ b/King.txt
--- a/1
+++ b/1
@@ -1 +0,0 @@
-ich bin Leo
--- a/Test1/Test123
+++ b/Test1/Test123
--- a/1
+++ b/1
@@ -1,2 +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
@@ -0,0 +1 @@
+Hallo
--- a/7
+++ b/7
@@ -1,7 +0,0 @@
-moin 
-<<<<<<< HEAD
-
-moin
-=======
-servus 
->>>>>>> dd4a6975ea164813267f1c744dfcab6c754534bc
--- a/tifla.txt
+++ b/tifla.txt
@@ -1 +1,3 @@
-Test
+test 
+ädnerung
+test
Author	SHA1	Message	Date
Tim Flaig	e6c0dc1dd6	Test Änderung	2025-02-21 16:22:36 +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
AdrianSommer	ede8449854	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:06:33 +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	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
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
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
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
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
Ann-Katrin Binder	a75b95c18d	new commit	2025-02-21 16:05:53 +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
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
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
Daniel King	145ba1fd44	KingCommit	2025-02-21 16:00:21 +01:00