Fix issues with merge conflicts
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 23 Jun 2015 11:01:02 +0000 (13:01 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 23 Jun 2015 11:01:02 +0000 (13:01 +0200)
commitea8a5aa23f73340312c1d094997e7f87c3b82fc6
tree5557c0b2f8679d9ac70cfdecbba4e9e80d2b0bd5
parent790395af664c2d587c67597924a6423f8ee89c39
Fix issues with merge conflicts
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java