# Conflicts:
#	manifest.json

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/active-form.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/radio-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/radio.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/select.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u--textarea/u--textarea.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-action-sheet/u-action-sheet.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-badge/u-badge.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-checkbox/u-checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-modal/u-modal.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-overlay/u-overlay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-popup/u-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-search/u-search.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-status-bar/u-status-bar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-switch/u-switch.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-textarea/u-textarea.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-transition/u-transition.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/binding.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/addCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/callDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/editCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/loveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/moveCarDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/myCall.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/myMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/myRecord.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/oneMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/recordDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/scan.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/addAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/ask.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/asking.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/carTime.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/editAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/help.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/myAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/myOrder.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/orderDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/pull.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/userInfo.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/pay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/payOk.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/search.js.map
#	unpackage/dist/dev/mp-weixin/common/active-form/active-form.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/checkbox-group.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/checkbox.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/popup.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/radio-group.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/radio.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/select.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u--textarea/u--textarea.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-action-sheet/u-action-sheet.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-badge/u-badge.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-checkbox-group/u-checkbox-group.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-checkbox/u-checkbox.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-modal/u-modal.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-overlay/u-overlay.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-popup/u-popup.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-search/u-search.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-status-bar/u-status-bar.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-switch/u-switch.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-textarea/u-textarea.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-transition/u-transition.js
#	unpackage/dist/dev/mp-weixin/pages/binding/binding.js
#	unpackage/dist/dev/mp-weixin/pages/binding/binding.wxml
#	unpackage/dist/dev/mp-weixin/pages/binding/index.js
#	unpackage/dist/dev/mp-weixin/pages/binding/index.wxml
#	unpackage/dist/dev/mp-weixin/pages/binding/index.wxss
#	unpackage/dist/dev/mp-weixin/pages/move-car/addCar.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/addCar.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/addCar.wxss
#	unpackage/dist/dev/mp-weixin/pages/move-car/callDetail.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/callDetail.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/editCar.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/editCar.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/editCar.wxss
#	unpackage/dist/dev/mp-weixin/pages/move-car/loveCar.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/loveCar.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/moveCarDetail.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/moveCarDetail.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/myCall.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/myCall.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/myMoveCar.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/myMoveCar.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/myRecord.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/myRecord.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/oneMoveCar.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/oneMoveCar.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/oneMoveCar.wxss
#	unpackage/dist/dev/mp-weixin/pages/move-car/recordDetail.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/recordDetail.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/scan.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/scan.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/scan.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/addAddress.js
#	unpackage/dist/dev/mp-weixin/pages/personal/addAddress.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/addAddress.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/ask.js
#	unpackage/dist/dev/mp-weixin/pages/personal/ask.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/asking.js
#	unpackage/dist/dev/mp-weixin/pages/personal/asking.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/carTime.js
#	unpackage/dist/dev/mp-weixin/pages/personal/carTime.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/carTime.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/editAddress.js
#	unpackage/dist/dev/mp-weixin/pages/personal/editAddress.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/editAddress.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/help.js
#	unpackage/dist/dev/mp-weixin/pages/personal/help.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/help.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/index.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/myAddress.js
#	unpackage/dist/dev/mp-weixin/pages/personal/myAddress.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/myAddress.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/myOrder.js
#	unpackage/dist/dev/mp-weixin/pages/personal/myOrder.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/myOrder.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/orderDetail.js
#	unpackage/dist/dev/mp-weixin/pages/personal/orderDetail.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/pull.js
#	unpackage/dist/dev/mp-weixin/pages/personal/pull.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/userInfo.js
#	unpackage/dist/dev/mp-weixin/pages/personal/userInfo.wxml
#	unpackage/dist/dev/mp-weixin/pages/shop/detail.js
#	unpackage/dist/dev/mp-weixin/pages/shop/detail.wxml
#	unpackage/dist/dev/mp-weixin/pages/shop/index.wxss
#	unpackage/dist/dev/mp-weixin/pages/shop/pay.js
#	unpackage/dist/dev/mp-weixin/pages/shop/pay.wxml
#	unpackage/dist/dev/mp-weixin/pages/shop/payOk.js
#	unpackage/dist/dev/mp-weixin/pages/shop/payOk.wxml
#	unpackage/dist/dev/mp-weixin/pages/shop/search.js
#	unpackage/dist/dev/mp-weixin/pages/shop/search.wxml
#	unpackage/dist/dev/mp-weixin/static/public.css