Merge branch 'main' of https://gitty.informatik.hs-mannheim.de/2012537/PR1_Git_Uebung.git into main

2022-10-12 13:23:55 +02:00 · 2022-10-12 13:23:55 +02:00 · 47131a3b81
parent a13b0d1df0 2936fe839b
commit 47131a3b81
4 changed files with 17 additions and 0 deletions
--- a/.project
+++ b/.project
@ -1,3 +1,16 @@
+<<<<<<< HEAD
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>PR1_Git_Uebung</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
+=======
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>PR1_Git_Uebung</name>
@ -9,3 +22,4 @@
 	<natures>
 	</natures>
 </projectDescription>
+>>>>>>> branch 'main' of https://gitty.informatik.hs-mannheim.de/2012537/PR1_Git_Uebung.git
--- a/2211778.txt
+++ b/2211778.txt
@ -0,0 +1 @@
+2211778
--- a/3003700.txt
+++ b/3003700.txt
@ -0,0 +1 @@
+Jeremy Karten
--- a/3003836.txt
+++ b/3003836.txt
@ -0,0 +1 @@
+din