# Conflicts:
#	config/dev.env.js
#	config/index.js
#	dev/index.html
#	dist/index.html
#	src/service/api.js