# Conflicts:
#	.gitignore
#	App.vue
#	README.md
#	api/api.js
#	api/http.js
#	main.js
#	manifest.json
#	pages.json
#	pages/login/login.vue
#	uni.scss
#	uni_modules/uv-action-sheet/package.json
#	uni_modules/uv-badge/package.json
#	uni_modules/uv-calendars/components/uv-calendars/i18n/index.js
#	uni_modules/uv-icon/package.json
#	uni_modules/uv-list/components/uv-list-item/uv-list-item.vue
#	uni_modules/uv-popup/components/uv-popup/keypress.js
#	uni_modules/uv-transition/components/uv-transition/createAnimation.js
#	uni_modules/uv-ui-tools/package.json