# Conflicts:
#	src/common/js/platform.js
#	src/common/js/wechatApi.js
#	src/index.html
#	src/modules/root/App.tsx