# Conflicts:
#	App.uvue
#	main.uts
#	manifest.json
#	pages.json
#	pages/API/choose-location/choose-location.test.js
#	pages/API/choose-location/choose-location.uvue
#	pages/API/compress-video/compress-video.uvue
#	pages/API/create-inner-audio-context/create-inner-audio-context.uvue
#	pages/API/create-inner-audio-context/inner-audio-format.uvue
#	pages/API/create-inner-audio-context/inner-audio-path.uvue
#	pages/API/create-selector-query/create-selector-query.test.js
#	pages/API/create-selector-query/create-selector-query.uvue
#	pages/API/dialog-page/dialog-1.uvue
#	pages/API/dialog-page/dialog-page.test.js
#	pages/API/dialog-page/dialog-page.uvue
#	pages/API/event-bus/uts-event-bus.test.js
#	pages/API/event-bus/uts-event-bus.uvue
#	pages/API/get-app/get-app.test.js
#	pages/API/get-app/get-app.uvue
#	pages/API/get-current-pages/get-current-pages.test.js
#	pages/API/get-current-pages/get-current-pages.uvue
#	pages/API/get-file-system-manager/get-file-system-manager.test.js
#	pages/API/get-window-info/window-area.uvue
#	pages/API/open-location/open-location.uvue
#	pages/API/preview-image/preview-image.uvue
#	pages/API/privacy/privacy.uvue
#	pages/API/report/report.test.js
#	pages/API/share-with-system/share-with-system.uvue
#	pages/API/storage/storage.test.js
#	pages/CSS/overflow/overflow-visible-event.uvue
#	pages/component/button/button.uvue
#	pages/component/canvas/canvas.uvue
#	pages/component/cover-view/cover-view.uvue
#	pages/component/editor/editor.test.js
#	pages/component/editor/editor.uvue
#	pages/component/list-view/list-view.test.js
#	pages/component/list-view/list-view.uvue
#	pages/component/map/map.uvue
#	pages/component/picker-view/picker-view.test.js
#	pages/component/rich-text/rich-text.test.js
#	pages/component/rich-text/rich-text.uvue
#	pages/component/slider/slider-maxValue.test.js
#	pages/component/video/video.test.js
#	pages/component/web-view/web-view.test.js
#	pages/pages.test.js
#	pages/tabBar/template.uvue
#	pages/template/slider-100/slider-100.uvue
#	uni_modules/uts-eventbus/utssdk/app-ios/index.uts