# Conflicts:
#	docs/api/a-d/rewarded-video.md
#	docs/case.md
#	docs/component/video.md
#	docs/uniCloud/hellodb.md
#	docs/uniCloud/learning.md
#	docs/uniCloud/resource.md

* update docs/vue3-basics.md.

替换荣耀亲选h5二维码

* update docs/component/video.md.

# Conflicts:
#	docs/api/location/map.md
#	docs/app/android-store.md
#	docs/component/map.md

# Conflicts:
#	docs/_navbar.md
#	docs/_sidebar.md
#	docs/api/_sidebar.md
#	docs/api/a-d/rewarded-video.md
#	docs/api/location/map.md
#	docs/api/media/file.md
#	docs/api/media/live-player-context.md
#	docs/api/plugins/login.md
#	docs/api/plugins/provider.md
#	docs/api/plugins/universal-links.md
#	docs/collocation/_sidebar.md
#	docs/collocation/manifest.md
#	docs/collocation/pages.md
#	docs/collocation/ssr.md
#	docs/component/_sidebar.md
#	docs/component/ad.md
#	docs/component/live-pusher.md
#	docs/component/map.md
#	docs/component/page-meta.md
#	docs/univerify.md