#0 - minor changes after merge resolution

avniproject · Sep 17, 2024 · e264d92 · e264d92
1 parent e9f37b0
commit e264d92
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/web/LocationController.java b/avni-server-api/src/main/java/org/avni/server/web/LocationController.java
@@ -8,6 +8,7 @@
 import org.avni.server.dao.sync.SyncEntityName;
 import org.avni.server.domain.AddressLevel;
 import org.avni.server.domain.accessControl.PrivilegeType;
+import org.avni.server.service.AddressLevelService;
 import org.avni.server.service.LocationService;
 import org.avni.server.service.ScopeBasedSyncService;
 import org.avni.server.service.UserService;

diff --git a/avni-server-api/src/test/java/org/avni/server/application/TestFormElementGroupBuilder.java b/avni-server-api/src/test/java/org/avni/server/application/TestFormElementGroupBuilder.java
@@ -33,11 +33,6 @@ public TestFormElementGroupBuilder withIsVoided(boolean isVoided) {
         return this;
     }
 
-    public TestFormElementGroupBuilder withDisplay(String display) {
-        formElementGroup.setDisplay(display);
-        return this;
-    }
-
     public TestFormElementGroupBuilder withRule(String rule) {
         formElementGroup.setRule(rule);
         return this;