Revision 530ba367
Added by Cherian Mathew almost 9 years ago
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java | ||
---|---|---|
34 | 34 |
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; |
35 | 35 |
import eu.etaxonomy.cdm.api.service.IClassificationService; |
36 | 36 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
37 |
<<<<<<< HEAD |
|
38 | 37 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
39 | 38 |
import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator; |
40 | 39 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
41 |
======= |
|
42 |
|
|
43 |
import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator; |
|
44 | 40 |
import eu.etaxonomy.cdm.model.taxon.TaxonNodeComparator; |
45 |
>>>>>>> ea8a5aa23f73340312c1d094997e7f87c3b82fc6 |
|
46 | 41 |
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; |
47 | 42 |
import eu.etaxonomy.taxeditor.model.DataChangeBridge; |
48 | 43 |
import eu.etaxonomy.taxeditor.model.IDataChangeBehavior; |
Also available in: Unified diff
Fix remaining conflict