From b640108b2b371b62c556d16bd6b4ba805d4e39ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20Sta=CC=88rk?= <jstaerk@usegroup.de Jochen Staerk>
Date: Sun, 28 May 2017 12:51:08 +0200
Subject: [PATCH] corrected merge error

---
 .../org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java
index 38660838..2f2c7fd3 100644
--- 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
 }