# Conflicts:
#	DAPlatform-front/build/webpack.base.conf.js
#	DAPlatform-front/package-lock.json
#	DAPlatform-front/src/App.vue
#	DAPlatform-front/src/components/HelloWorld.vue
#	DAPlatform-front/src/main.js
#	DAPlatform-front/src/router/index.js