fixed problems with merge
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 22 May 2015 09:25:01 +0000 (11:25 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 22 May 2015 09:25:01 +0000 (11:25 +0200)
commitd61bbb8bde2c0df3abe89a0a243159073f1ef4b1
tree451f4b7979290206230059426f2133d45f515baa
parent4b94c9cfe0df4ec8f83395b88d8420c5791a93b4
fixed problems with merge
.gitignore
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/TransientTaxonService.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF