# Conflicts:
#   dev/src/public/defaultConfig.js
#   dev/src/public/public.js
#   dev/src/view/doorlockManage/v_index.js