# Conflicts: # application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java # application/src/main/java/org/thingsboard/server/service/sync/vc/LocalGitVersionControlService.java
# Conflicts: # application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java # application/src/main/java/org/thingsboard/server/service/sync/vc/LocalGitVersionControlService.java