# Conflicts: # dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java # dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java
# Conflicts: # dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java # dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java