# Conflicts:
#	History.md
#	web/lib/js/p.js
#	web/lib/less/addDevice/addDevice.less
#	web/lib/less/device/device.less
#	web/lib/less/public/animation.less
#	web/lib/less/public/core.less
#	web/lib/less/public/public.less
#	web/resources/font/iconfont.ttf
#	web/resources/lang/zh.json
#	web/view/addDevice/addDevice.css
#	web/view/device/device.css