Merge branch 'main' of

https://gitty.informatik.hs-mannheim.de/2012537/PR1_Git_Uebung.git into main
2022-10-12 13:17:07 +02:00 · 2022-10-12 13:17:07 +02:00 · b71830cacc
parent c3c88d266a 70e507878b
commit b71830cacc
6 changed files with 19 additions and 0 deletions
--- a/.project
+++ b/.project
@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>PR1_Git_Uebung</name>
@ -9,3 +10,16 @@
 	<natures>
 	</natures>
 </projectDescription>
+=======
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>PR1_Git_Uebung</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
+>>>>>>> branch 'main' of https://gitty.informatik.hs-mannheim.de/2012537/PR1_Git_Uebung.git
--- a/3002861.txt
+++ b/3002861.txt
@ -0,0 +1 @@
+Lorenzo Corso 
--- a/3003701.txt
+++ b/3003701.txt
@ -0,0 +1 @@
+Argtim Zabrdja
--- a/3004061.txt
+++ b/3004061.txt
@ -0,0 +1 @@
+Duncan Rapp
--- a/3004570.txt
+++ b/3004570.txt
@ -0,0 +1 @@
+Kaan Kanat
--- a/1
+++ b/1
@ -0,0 +1 @@
+Ibrahim Jabban