Revision 94f804c7
Added by Andreas Müller about 5 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/PlantGlossaryCsvImportState.java | ||
|---|---|---|
| 21 | 21 |
import eu.etaxonomy.cdm.model.agent.Institution; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.agent.Person; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.agent.Team; |
| 24 |
<<<<<<< HEAD |
|
| 25 |
======= |
|
| 26 | 24 |
import eu.etaxonomy.cdm.model.common.IdentifiableSource; |
| 27 | 25 |
import eu.etaxonomy.cdm.model.common.OriginalSourceType; |
| 28 |
import eu.etaxonomy.cdm.model.common.TermType; |
|
| 29 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
|
| 30 |
>>>>>>> master |
|
| 31 | 26 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod; |
| 32 | 27 |
import eu.etaxonomy.cdm.model.description.Feature; |
| 33 | 28 |
import eu.etaxonomy.cdm.model.description.State; |
| 34 | 29 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 35 | 30 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 31 |
import eu.etaxonomy.cdm.model.term.TermType; |
|
| 36 | 32 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
| 37 | 33 |
|
| 38 | 34 |
/** |
Also available in: Unified diff
fix merge issue in PlantGlossaryCsvImportState