Merge remote-tracking branch 'origin/main' into feature/sabi-157

# Conflicts: # captcha/pom.xml # sabi-database/src/main/resources/db/migration/version1_3_0/V1_3_0_4__i18nUnit.sql # sabi-server/pom.xml # sabi-server/src/main/java/de/bluewhale/sabi/mapper/UnitMapper.java # sabi-server/src/main/java/de/bluewhale/sabi/persistence/model/LocalizedParameterEntity.java # sabi-server/src/main/java/de/bluewhale/sabi/persistence/model/LocalizedUnitEntity.java # sabi-server/src/main/java/de/bluewhale/sabi/persistence/model/ParameterEntity.java # sabi-server/src/test/java/de/bluewhale/sabi/BasicDataFactory.java # sabi-server/src/test/java/de/bluewhale/sabi/services/MeasurementServiceTest.java # sabi-webclient/pom.xml
StefanSchubert · Oct 3, 2024 · f64af84 · f64af84
2 parents 0fce96c + 60a4e69
commit f64af84
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/sabi-server/src/main/java/de/bluewhale/sabi/persistence/model/UnitEntity.java b/sabi-server/src/main/java/de/bluewhale/sabi/persistence/model/UnitEntity.java
@@ -12,6 +12,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Table(name = "unit", schema = "sabi")
 @Entity
 @Data