diff --git a/.project b/.project
new file mode 100644
index 0000000..02dcb12
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>BPMN_Projekt</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/Rechnungseingang/target/m2e-wtp/web-resources/.gitignore b/Rechnungseingang/target/m2e-wtp/web-resources/.gitignore
new file mode 100644
index 0000000..3385916
--- /dev/null
+++ b/Rechnungseingang/target/m2e-wtp/web-resources/.gitignore
@@ -0,0 +1 @@
+/META-INF/
diff --git a/Rechnungseingang/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF b/Rechnungseingang/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
index 10f62d5..d6d1766 100644
--- a/Rechnungseingang/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
+++ b/Rechnungseingang/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Built-By: Lukas
-Build-Jdk: 1.8.0_241
+Built-By: schmi
+Build-Jdk: 13.0.1
 Created-By: Maven Integration for Eclipse
 
diff --git a/Rechnungseingang/target/m2e-wtp/web-resources/META-INF/maven/com.bpmn/Rechnungseingang/pom.properties b/Rechnungseingang/target/m2e-wtp/web-resources/META-INF/maven/com.bpmn/Rechnungseingang/pom.properties
index 4e6852a..b0f0a05 100644
--- a/Rechnungseingang/target/m2e-wtp/web-resources/META-INF/maven/com.bpmn/Rechnungseingang/pom.properties
+++ b/Rechnungseingang/target/m2e-wtp/web-resources/META-INF/maven/com.bpmn/Rechnungseingang/pom.properties
@@ -1,7 +1,13 @@
 #Generated by Maven Integration for Eclipse
-#Mon May 25 14:25:24 CEST 2020
+<<<<<<< HEAD
+#Sat May 23 11:04:17 CEST 2020
+m2e.projectLocation=C\:\\Users\\schmi\\BPMN_Projekt\\Rechnungseingang
+=======
+#Wed May 27 12:45:56 CEST 2020
 version=0.0.1-SNAPSHOT
 groupId=com.bpmn
+>>>>>>> db7a5389490243f2c48da55cd2f57f7c18eeab7d
 m2e.projectName=Rechnungseingang
-m2e.projectLocation=C\:\\Users\\Lukas\\Desktop\\6 Semester - Seminararbeit\\BPMN_Projekt\\Rechnungseingang
+groupId=com.bpmn
 artifactId=Rechnungseingang
+version=0.0.1-SNAPSHOT