From e264d922ecb3db5ce9553151e3685927f5e298b4 Mon Sep 17 00:00:00 2001
From: Vivek Singh <petmongrels@gmail.com>
Date: Tue, 17 Sep 2024 16:50:36 +0530
Subject: [PATCH] #0 - minor changes after merge resolution

---
 .../main/java/org/avni/server/web/LocationController.java    | 1 +
 .../avni/server/application/TestFormElementGroupBuilder.java | 5 -----
 2 files changed, 1 insertion(+), 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
index 8790122af..20a1dd821 100644
--- 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
index b3e0407d8..7f0c4bad5 100644
--- 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;