all delete methods need an Uuid as argument

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

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index f12b34a94b1c166384922dadf6a1f30b39486eb2..04f1b0cf652504a2f8e96aef8603bbd150afc402 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
@@ -1056,6 +1056,7 @@ public class TransientOccurenceService implements IOccurrenceService {
            return defaultService.getAllHierarchyDerivatives(specimen);
        }
 
+<<<<<<< HEAD
     /**
      * {@inheritDoc}
      */
@@ -1063,5 +1064,11 @@ public class TransientOccurenceService implements IOccurrenceService {
     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
 
 }