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

@@ -409,8 +409,6 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
// remove our authorization policies
authorizeService.removeAllPolicies(context, bundle);
deleteMetadata(context, bundle);
// Remove ourself
bundleDAO.delete(context, bundle);
}