# Conflicts:
#	History.md
#	dev/src/view/device/v_hijackRecord.js
#	dev/src/view/device/v_opendoorRecord.js
#	doorlockApp/web/view/device/device.css
#	doorlockApp/web/view/device/recordList.css
#	doorlockApp/web/view/doorlockManage/doorlockManage.css
#	web/lib/less/addDevice/addDevice.less
#	web/lib/less/bindUser/bindUser.less
#	web/lib/less/device/device.less
#	web/lib/less/device/recordList.less
#	web/lib/less/doorlockManage/doorlockManage.less
#	web/lib/less/login/login.less
#	web/lib/less/public/animation.less
#	web/resources/lang/zh.json
#	web/view/device/device.css
#	web/view/device/recordList.css
#	web/view/doorlockManage/doorlockManage.css