7 changed files with 0 additions and 20 deletions
--- a/.project
+++ b/.project
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>PR1_Git_Uebung</name>
@ -10,16 +9,3 @@
 	<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/2123178.txt
+++ b/2123178.txt
@ -1 +0,0 @@
-Oliver Piorek
--- a/2211778.txt
+++ b/2211778.txt
@ -1 +0,0 @@
-2211778
--- a/1
+++ b/1
@ -1 +0,0 @@
-Efstathios Kalaitsidis 1
--- a/3003700.txt
+++ b/3003700.txt
@ -1 +0,0 @@
-Jeremy Karten
--- a/3003836.txt
+++ b/3003836.txt
@ -1 +0,0 @@
-din 
--- a/3004061.txt
+++ b/3004061.txt
@ -1 +0,0 @@
-Duncan Rapp