Skip to content
Snippets Groups Projects
Dante Aléo's avatar
Dante Aléo authored
# Conflicts:
#   pinsisApp/src/app/edit-machine/edit-machine.component.html
#   pinsisApp/src/app/edit-machine/edit-machine.component.ts
#   pinsisApp/src/app/machines.service.ts
#   pinsisApp/src/app/register-equipment/register-equipment.component.html
#   pinsisApp/src/app/register-equipment/register-equipment.component.ts
d7b09c7b
History
Name Last commit Last update
..