From e19a1f6dabc047a17eeb3079b74e01d93372372f Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 27 May 2020 15:09:35 +0200 Subject: [PATCH] Kermit --- .../maven/com.bpmn/Rechnungseingang/pom.properties | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 Rechnungseingang/target/m2e-wtp/web-resources/META-INF/maven/com.bpmn/Rechnungseingang/pom.properties 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 deleted file mode 100644 index b0f0a05..0000000 --- a/Rechnungseingang/target/m2e-wtp/web-resources/META-INF/maven/com.bpmn/Rechnungseingang/pom.properties +++ /dev/null @@ -1,13 +0,0 @@ -#Generated by Maven Integration for Eclipse -<<<<<<< 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 -groupId=com.bpmn -artifactId=Rechnungseingang -version=0.0.1-SNAPSHOT