# Conflicts:
#	package-lock.json
#	package.json
#	src/app/app.config.ts
#	src/app/routes/data-v/workstation/workstation.component.html
#	src/app/routes/data-v/workstation/workstation.component.ts
#	src/styles.less
#	yarn.lock