Merge branch 'master' of https://git.cliffbreak.de/Cockpit/BPMN_Projekt
This commit is contained in:
commit
e0e3c21501
4 changed files with 22 additions and 4 deletions
11
.project
Normal file
11
.project
Normal file
|
@ -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>
|
1
Rechnungseingang/target/m2e-wtp/web-resources/.gitignore
vendored
Normal file
1
Rechnungseingang/target/m2e-wtp/web-resources/.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
/META-INF/
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue