# Conflicts:
#	packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
#	packages/vue-cli-plugin-uni/lib/env.js
#	packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js