# Conflicts: # application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java # application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
# Conflicts: # application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java # application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java