# Conflicts:
#	packages/uni-mp-qq/dist/index.js
#	packages/uni-mp-weixin/dist/index.js
#	packages/vue-cli-plugin-uni/index.js
#	packages/vue-cli-plugin-uni/lib/chain-webpack.js
#	packages/vue-cli-plugin-uni/lib/configure-webpack.js
#	packages/vue-cli-plugin-uni/lib/h5/index.js
#	packages/vue-cli-plugin-uni/lib/mp.js
#	packages/vue-cli-plugin-uni/package.json
#	src/platforms/app-plus/service/api/device/soter-authentication.js
#	src/platforms/app-plus/service/api/index.js
#	src/platforms/app-plus/service/framework/webview/index.js

# Conflicts:
#	src/core/view/components/input/index.vue
#	src/core/view/mixins/index.js
#	src/core/view/mixins/keyboard.js