# Conflicts:
#	config/dev.env.js
#	src/main.js
#	src/pages/applications/electronicContract/electronicContract.vue
#	src/pages/applications/userRegisters/companyRegister.vue
#	src/pages/applications/userRegisters/userRegister.vue