create stefan file

Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis
2025-02-21 16:13:34 +01:00 · 2025-02-21 16:08:33 +01:00 · 2025-02-21 16:08:08 +01:00 · 2025-02-21 16:07:57 +01:00 · 2025-02-21 16:07:54 +01:00 · 2025-02-21 16:07:49 +01:00
8 changed files with 13 additions and 3 deletions
--- a/King.txt
+++ b/King.txt
--- a/1
+++ b/1
@@ -1 +1,2 @@
 ich bin Leo
 ich nicht 
--- a/3
+++ b/3
@@ -1,2 +1,3 @@
 Hello there!
-Berlin was geht ab, seid ihr gut drauf oder was?
+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/1
+++ b/1
@@ -21,3 +21,4 @@ can not confirm
 Benutzer: Admin
 Passwort: Passwort123456
 >>>>>>> 829eebcc9143e352a3e3212eb825e99ba0f8be4c
 Was sollen diese dinge 
--- a/7
+++ b/7
@@ -1,4 +1,9 @@
 moin 
-moin
+servus 
 moin
 moin
 =======
 servus 
--- a/stefan.md
+++ b/stefan.md
--- a/tifla.txt
+++ b/tifla.txt
@@ -1 +1,2 @@
-Test
+Test
 Änderung
Author	SHA1	Message	Date
Stefan Möller	8d4abb7b4e	create stefan file	2025-02-21 16:13:34 +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
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
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
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
Leo Schlegel	7ebfcf48cd	moin	2025-02-21 16:04:54 +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