# Conflicts:
#	dist/index.html
#	dist/static/js/card.ab453e79fc8f4f4fa9e6.js
#	dist/static/js/ecm.46e7a962fa533a2b5a74.js
#	dist/static/js/ecm.7df86b8fb7cb8e487316.js
#	dist/static/js/ecm.ba63bb58d51729e84928.js
#	dist/static/js/evaluation.24dee8cce61b88177e37.js
#	dist/static/js/evaluation.7f6636ae60d3eda39960.js
#	dist/static/js/evaluation.84de0170a7d4d20235a3.js
#	dist/static/js/manifest.8e9ebdd7fd0b64c67849.js

# Conflicts:
#	static/fonts/iconfont.js

# Conflicts:
#	dist/static/css/main.8421768521b4c1ec8d409a77bae99ecc.css
#	dist/static/fonts/iconfont.js
#	dist/static/js/card.1971ddfa9b81a96d23e4.js
#	dist/static/js/ecm.64ad931562bad4d3dec6.js
#	dist/static/js/evaluation.f752f3bd35e522d09c7b.js
#	dist/static/js/ewash.3def07f79fb358530409.js
#	dist/static/js/message.e9b4bbfeea4a3ccd76e0.js
#	dist/static/js/popup.904b5a302f41c02f8b89.js
#	dist/static/js/scan.5e57fe1beb143ec5df5f.js
#	static/fonts/iconfont.js