# Conflicts: # pages.json # unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map # unpackage/dist/dev/mp-weixin/app.json # unpackage/dist/dev/mp-weixin/common/vendor.js # unpackage/dist/dev/mp-weixin/project.config.json # unpackage/dist/dev/mp-weixin/project.private.config.json