# Conflicts:
#	components/api-set-tabbar/api-set-tabbar.vue
#	manifest.json
#	pages.json
#	pages/API/animate/animate.uvue
#	pages/API/choose-file/choose-file.uvue
#	pages/API/compress-image/compress-image.uvue
#	pages/API/connect-event-source/connect-event-source.uvue
#	pages/API/create-inner-audio-context/create-inner-audio-context.test.js
#	pages/API/dialog-page/dialog-page.test.js
#	pages/API/dialog-page/dialog-page.uvue
#	pages/API/get-current-pages/get-current-pages.uvue
#	pages/API/get-file-system-manager/get-file-system-manager.test.js
#	pages/API/get-location/get-location.test.js
#	pages/API/is-simulator/is-simulator.uvue
#	pages/API/navigator/navigator.uvue
#	pages/API/navigator/new-page/onLoad.test.js
#	pages/API/preview-image/preview-image.uvue
#	pages/API/request/request.uvue
#	pages/API/show-action-sheet/show-action-sheet.test.js
#	pages/API/show-action-sheet/show-action-sheet.uvue
#	pages/CSS/transition/transition.uvue
#	pages/CSS/variable/variable.uvue
#	pages/component/cover-view/cover-view.test.js
#	pages/component/global-events/global-events.test.js
#	pages/component/global-events/touch-events-case.uvue
#	pages/component/global-events/touch-events-preventDefault.test.js
#	pages/component/native-view/native-view.uvue
#	pages/component/nested-scroll-body/nested-scroll-body.test.js
#	pages/component/picker-view/picker-view.test.js
#	pages/component/picker-view/picker-view.uvue
#	pages/component/rich-text/rich-text-tags.test.js
#	pages/component/swiper/swiper.test.js
#	pages/component/text/text-props.test.js
#	pages/component/text/text-props.uvue
#	pages/component/waterflow/waterflow-fit-height.uvue
#	pages/pages.test.js
#	pages/template/long-waterflow-nested/long-waterflow-nested.test.js
#	testSequencer.js
#	uni_modules/uni-openLocation/pages/openLocation/openLocation.uvue
#	uni_modules/uni-stat/package.json