Merge branch 'master' of https://git.cliffbreak.de/Cockpit/BPMN_Projekt
This commit is contained in:
commit
6d381d8d4f
1 changed files with 0 additions and 13 deletions
|
@ -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
|
|
Loading…
Reference in a new issue