# Conflicts:
#	server/config.js
#	src/App.vue
#	src/main.js
#	src/router/index.js
#	src/store/index.js
#	src/utils/request.js
#	vue.config.js