louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected merge error

Browse Source
This commit is contained in:
Jochen Stärk
2017-05-28 12:51:08 +02:00
parent 417f399f14
commit b640108b2b
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java
View File

@@ -1,9 +1,5 @@
package org.mustangproject.ZUGFeRD; package org.mustangproject.ZUGFeRD;
public enum ZUGFeRDConformanceLevel { public enum ZUGFeRDConformanceLevel {
<<<<<<< HEAD
BASIC, COMFORT, EXTENDED; BASIC, COMFORT, EXTENDED;
=======
BASIC, COMFORT, EXTENDED
>>>>>>> a6c972eb3cdfdebf0374a2e87a48bd14b463ff78
} }