# Conflicts:
#	backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/CameraInfoController.java

# Conflicts:
#	backend/inz.basis/src/main/java/com/beecode/inz/basis/web/WarehouseUserController.java