Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / AnnotationService.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java
index 82032be74e9492676eef46c4bcbdf3a5997c8c73..2d361b132894db1bc21ff1245120a9a3ff32455f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java
@@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.cdm.model.permission.User;
 import eu.etaxonomy.cdm.persistence.dao.hibernate.common.AnnotationDaoImpl;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;