# Conflicts:
#	src/components/allCustomers/allCustomersList.vue
#	src/components/allCustomers/customerDetail.vue

# Conflicts:
#	dist/css/app.a9e0b1601d952aab72c36f6ea233c033.css
#	dist/css/app.aa2f9813257d94d71851f63d6940f9b0.css
#	dist/css/app.cf8a09b3fb2f024e545f7cf284864d46.css
#	dist/index.html
#	dist/js/app.44757939d76367f006a5.js
#	dist/js/app.4744d8710472ecc1dcdf.js
#	dist/js/app.4f7a3780479e89e5a7b1.js
#	dist/js/manifest.12884f8de16beb7f31a3.js
#	dist/js/manifest.8539470e50321dcf0f0c.js
#	dist/js/manifest.930390efb46d65117d92.js