# Conflicts:
#	package.json
#	packages/size-check/package.json
#	packages/uni-api/package.json
#	packages/uni-app-plus/dist/uni-app-service.es.js
#	packages/uni-app-plus/package.json
#	packages/uni-app-vite/package.json
#	packages/uni-app-vite/src/plugin/index.ts
#	packages/uni-app-vue/package.json
#	packages/uni-app/package.json
#	packages/uni-automator/package.json
#	packages/uni-cli-nvue/package.json
#	packages/uni-cli-shared/package.json
#	packages/uni-cloud/package.json
#	packages/uni-components/package.json
#	packages/uni-core/package.json
#	packages/uni-h5-vite/package.json
#	packages/uni-h5-vue/package.json
#	packages/uni-h5/package.json
#	packages/uni-i18n/package.json
#	packages/uni-mp-alipay/package.json
#	packages/uni-mp-baidu/package.json
#	packages/uni-mp-compiler/package.json
#	packages/uni-mp-core/package.json
#	packages/uni-mp-kuaishou/package.json
#	packages/uni-mp-lark/package.json
#	packages/uni-mp-qq/package.json
#	packages/uni-mp-toutiao/package.json
#	packages/uni-mp-vite/package.json
#	packages/uni-mp-vue/package.json
#	packages/uni-mp-weixin/package.json
#	packages/uni-push/package.json
#	packages/uni-quickapp-webview/package.json
#	packages/uni-shared/package.json
#	packages/uni-stat/dist/uni-stat.cjs.js
#	packages/uni-stat/dist/uni-stat.es.js
#	packages/uni-stat/package.json
#	packages/uni-vue/package.json
#	packages/vite-plugin-uni/package.json
#	pnpm-lock.yaml

# Conflicts:
#	packages/uni-h5/dist/uni-h5.cjs.js
#	packages/uni-h5/dist/uni-h5.es.js