# Conflicts:
#	packages/uni-app-plus/dist/uni.x.runtime.esm.js

# Conflicts:
#	package.json
#	packages/size-check/package.json
#	packages/uni-api/package.json
#	packages/uni-app-plus/package.json
#	packages/uni-app-uts/package.json
#	packages/uni-app-vite/package.json
#	packages/uni-app-vue/package.json
#	packages/uni-app/package.json
#	packages/uni-automator/package.json
#	packages/uni-cli-shared/package.json
#	packages/uni-cli-utils/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-jd/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-mp-xhs/package.json
#	packages/uni-nvue-styler/package.json
#	packages/uni-preprocess/package.json
#	packages/uni-push/package.json
#	packages/uni-quickapp-webview/package.json
#	packages/uni-shared/package.json
#	packages/uni-stacktracey/package.json
#	packages/uni-stat/dist/uni-cloud-stat.cjs.js
#	packages/uni-stat/dist/uni-cloud-stat.es.js
#	packages/uni-stat/dist/uni-stat.cjs.js
#	packages/uni-stat/dist/uni-stat.es.js
#	packages/uni-stat/package.json
#	packages/uni-uts-v1/lib/javascript/dist/index.js
#	packages/uni-uts-v1/lib/kotlin/dist/index.js
#	packages/uni-uts-v1/package.json
#	packages/uni-vue-devtools/package.json
#	packages/uni-vue/package.json
#	packages/uts-darwin-arm64/package.json
#	packages/uts-darwin-arm64/uts.darwin-arm64.node
#	packages/uts-darwin-x64/package.json
#	packages/uts-darwin-x64/uts.darwin-x64.node
#	packages/uts-linux-x64-gnu/package.json
#	packages/uts-linux-x64-gnu/uts.linux-x64-gnu.node
#	packages/uts-linux-x64-musl/package.json
#	packages/uts-linux-x64-musl/uts.linux-x64-musl.node
#	packages/uts-win32-ia32-msvc/package.json
#	packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node
#	packages/uts-win32-x64-msvc/package.json
#	packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node
#	packages/uts/package.json
#	packages/vite-plugin-uni/package.json
#	pnpm-lock.yaml