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

Merge pull request 'my_branch' (#2 ) from my_branch into main
Reviewed-on: #2
2025-02-21 16:26:31 +01:00 · 2025-02-21 15:26:30 +00:00 · 2025-02-21 16:26:29 +01:00 · 2025-02-21 16:24:40 +01:00 · 2025-02-21 16:24:11 +01:00 · 2025-02-21 16:23:46 +01:00
9 changed files with 38 additions and 38 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,32 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
--- a/2
+++ b/2
@@ -1,2 +0,0 @@
-ich bin Leo
-ich nicht 
--- a/2
+++ b/2
@@ -1,3 +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
+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/1
+++ b/1
@@ -0,0 +1 @@
+hihihi
--- a/24
+++ b/24
@@ -1,24 +0,0 @@
-Schreibgeschützt
-
-So schreibgeschützt ist das gar nicht
-
-:(
-So schreibgeschützt ist das gar nicht 
-
-Hier ist gar nichts schreibgeschützt:)
-
-0 von 5 Sterne 
-0 von 5 Sterne 
-
-<<<<<<< HEAD
-is ja mal mega langweilig
-=======
-can not confirm
-<<<<<<< HEAD
->>>>>>> dd4a6975ea164813267f1c744dfcab6c754534bc
-=======
-
-Benutzer: Admin
-Passwort: Passwort123456
->>>>>>> 829eebcc9143e352a3e3212eb825e99ba0f8be4c
-Was sollen diese dinge 
--- a/leo.txt
+++ b/leo.txt
@@ -0,0 +1 @@
+Ich bin Leo
--- a/9
+++ b/9
@@ -1,9 +0,0 @@
-moin 
-
-servus 
-moin
-
-moin
-
-=======
-servus 
--- a/readme.md
+++ b/readme.md
@@ -1,2 +1,3 @@
 DAS IST EINE README
+hehehe hab den branch geändert
 Okay 
--- a/tifla.txt
+++ b/tifla.txt
@@ -1,2 +1,2 @@
-Test
-Änderung
+test 
+ädnerung
Author	SHA1	Message	Date
Stefan Möller	e46e5a5ef9	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:26:31 +01:00
e23021	ac745fb51b	Merge pull request 'my_branch' (#2 ) from my_branch into main Reviewed-on: #2	2025-02-21 15:26:30 +00:00
Stefan Möller	854d74bbd6	Add gitignore	2025-02-21 16:26:29 +01:00
Leo Schlegel	e76d1acd63	delete	2025-02-21 16:24:40 +01:00
Leo Schlegel	525d9c653d	new file	2025-02-21 16:24:11 +01:00
Leo Schlegel	a2aaacf278	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:23:46 +01:00
Leo Schlegel	d3adf005b2	gitignoer	2025-02-21 16:23:35 +01:00
DanielV	f96ad6d4d0	Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch	2025-02-21 16:23:27 +01:00
DanielV	6514c058b1	Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch	2025-02-21 16:22:48 +01:00
Jonas Kieninger	abf8f58db5	doch nicht	2025-02-21 16:21:10 +01:00
Jonas Kieninger	e146686ee1	Lets play	2025-02-21 16:19:14 +01:00
Stefan Möller	40ca9a520a	Merge branch 'feature/stefan'	2025-02-21 16:17:12 +01:00
Mike Teufel	e4023db286	gelöscht	2025-02-21 16:16:38 +01:00
Mike Teufel	cf05e2a64a	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis	2025-02-21 16:15:29 +01:00
Mike Teufel	c25845de1d	hallo	2025-02-21 16:15:21 +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
DanielV	f6a1c68a7b	hahaha	2025-02-21 16:07:41 +01:00
Jonas Kieninger	3cc458995e	Wunschliste	2025-02-21 16:07:13 +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