fixed conflicts from last commit

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / dataimport / transientServices / TransientReferenceService.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
index e6456b1431a37d5fe006f1d113faa6e3c8bfd842..8be8cc8869e0070edbebe80cbdf95c52ce116579 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
@@ -710,7 +710,6 @@ public class TransientReferenceService implements IReferenceService {
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 
-<<<<<<< HEAD
     /**
      * {@inheritDoc}
      */
@@ -718,11 +717,6 @@ public class TransientReferenceService implements IReferenceService {
     public DeleteResult delete(UUID arg0) {
         return defaultService.delete(arg0);
     }
-=======
-       @Override
-       public DeleteResult delete(UUID arg0) {
-               return defaultService.delete(arg0);
-       }
->>>>>>> b275ef1... all delete methods need an Uuid as argument
+
 
 }