# Conflicts:
#	.env.dev
#	.env.production
#	src/views/Home.vue
#	src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue