all delete methods need an Uuid as argument

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

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
index 552d205fe31df869cb6e810c121ef70704550f68..700b48e1cc9da3b920bab870a461cce11511ea5b 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
@@ -872,6 +872,7 @@ public class TransientTermService implements ITermService {
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 
+<<<<<<< HEAD
     /**
      * {@inheritDoc}
      */
@@ -879,5 +880,11 @@ public class TransientTermService implements ITermService {
     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
 
 }