# Conflicts:
#	docs/collocation/manifest.md
#	packages/uni-app-plus/dist/index.v3.js
#	packages/uni-app-plus/dist/view.css
#	packages/uni-app-plus/dist/view.umd.min.js
#	packages/uni-h5/dist/index.css
#	packages/uni-h5/dist/index.umd.min.js