DS-3851 manually solve unnoted merge conflict

2025-10-07 01:54:22 +00:00 · 2019-03-15 22:21:45 +01:00
parent 1df2d35c1f
commit 5d997e6cde
1 changed files with 0 additions and 5 deletions
--- a/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/EPersonBuilder.java
+++ b/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/EPersonBuilder.java
@@ -32,11 +32,6 @@ public class EPersonBuilder extends AbstractDSpaceObjectBuilder<EPerson> {
        return ePersonService;
    }

-    @Override
-    protected int getPriority() {
-        return 100;
-    }
-
    public EPerson build() {
        try {
            ePersonService.update(context, ePerson);