# Conflicts:
#	config/dev.env.js
#	src/components/map/index.vue
#	src/components/newLesson/audio.vue
#	src/components/newLesson/index.vue