fixed conflicts from last commit
authorCherian Mathew <c.mathew@bgbm.org>
Mon, 22 Jun 2015 09:31:26 +0000 (11:31 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Mon, 22 Jun 2015 09:31:26 +0000 (11:31 +0200)
commit1706bc52d965cc1bd54ab70c5c28d3cfc1aeab12
treef46c4b92caaf6a5d12e05ea299de73a362fdb97e
parent562118a0faa1060108742d419ac9fd744716c18d
fixed conflicts from last commit
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