# Conflicts: # src/app/routes/data-v/navigation/navigation.component.ts # src/app/routes/data-v/routes.ts # src/app/routes/data-v/s1/s1.component.html # src/app/routes/data-v/s1/s1.component.ts # src/app/routes/data-v/workstation/workstation.component.ts # yarn.lock