Revision 562118a0
Added by Katja Luther almost 9 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java | ||
|---|---|---|
| 1056 | 1056 |
return defaultService.getAllHierarchyDerivatives(specimen); |
| 1057 | 1057 |
} |
| 1058 | 1058 |
|
| 1059 |
<<<<<<< HEAD |
|
| 1059 | 1060 |
/** |
| 1060 | 1061 |
* {@inheritDoc}
|
| 1061 | 1062 |
*/ |
| ... | ... | |
| 1063 | 1064 |
public DeleteResult delete(UUID arg0) {
|
| 1064 | 1065 |
return defaultService.delete(arg0); |
| 1065 | 1066 |
} |
| 1067 |
======= |
|
| 1068 |
@Override |
|
| 1069 |
public DeleteResult delete(UUID arg0) {
|
|
| 1070 |
return defaultService.delete(arg0); |
|
| 1071 |
} |
|
| 1072 |
>>>>>>> b275ef1... all delete methods need an Uuid as argument |
|
| 1066 | 1073 |
|
| 1067 | 1074 |
} |
Also available in: Unified diff
all delete methods need an Uuid as argument
Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java