fix conflict

This commit is contained in:
Tom Desair
2016-04-07 16:31:10 +02:00
committed by dylan
parent b19189634d
commit 8db0faed33
102 changed files with 665 additions and 535 deletions

View File

@@ -209,9 +209,6 @@ public class EPersonServiceImpl extends DSpaceObjectServiceImpl<EPerson> impleme
throw new AuthorizeException(new EPersonDeletionException(constraintList));
}
// Delete the Dublin Core
deleteMetadata(context, ePerson);
context.addEvent(new Event(Event.DELETE, Constants.EPERSON, ePerson.getID(), ePerson.getEmail(), getIdentifiers(context, ePerson)));
// XXX FIXME: This sidesteps the object model code so it won't