# Conflicts:
#	src/App.vue
#	src/router/router.js
#	src/utils/env-config.js
#	src/utils/fetch.js
#	src/utils/index.js
#	src/views/layout/slidebar.vue