# Conflicts:
#	packages/vue-cli-plugin-uni/commands/build.js
#	packages/vue-cli-plugin-uni/lib/env.js
#	yarn.lock