[misc] Fixed merge conflict

phenotips · Jan 24, 2018 · 6535f3e · 6535f3e
1 parent b2d8501
commit 6535f3e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/...nts/patient-data/impl/src/main/java/org/phenotips/data/internal/PatientEntityManager.java b/...nts/patient-data/impl/src/main/java/org/phenotips/data/internal/PatientEntityManager.java
@@ -35,7 +35,6 @@
  * @version $Id$
  * @since 1.0M8
  */
-@Component(roles = { PrimaryEntityManager.class })
 @Named("Patient")
 @Component(roles = {PrimaryEntityManager.class})
 @Singleton