corrected merge error

2017-05-28 12:51:08 +02:00
parent 417f399f14
commit b640108b2b
1 changed files with 0 additions and 4 deletions
--- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java
@@ -1,9 +1,5 @@
 package org.mustangproject.ZUGFeRD;

 public enum ZUGFeRDConformanceLevel {
-<<<<<<< HEAD
    BASIC, COMFORT, EXTENDED;
-=======
-    BASIC, COMFORT, EXTENDED
->>>>>>> a6c972eb3cdfdebf0374a2e87a48bd14b463ff78
 }