Revision 562118a0
Added by Katja Luther almost 9 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java | ||
---|---|---|
770 | 770 |
return defaultService.convertTeam2Person(arg0); |
771 | 771 |
} |
772 | 772 |
|
773 |
<<<<<<< HEAD |
|
773 | 774 |
/** |
774 | 775 |
* {@inheritDoc} |
775 | 776 |
*/ |
... | ... | |
777 | 778 |
public DeleteResult delete(UUID arg0) { |
778 | 779 |
return defaultService.delete(arg0); |
779 | 780 |
} |
781 |
======= |
|
782 |
@Override |
|
783 |
public DeleteResult delete(UUID arg0) { |
|
784 |
return defaultService.delete(arg0); |
|
785 |
} |
|
786 |
>>>>>>> b275ef1... all delete methods need an Uuid as argument |
|
780 | 787 |
|
781 | 788 |
} |
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