# Conflicts (solo ficheros de datos): # .gitignore # assets/data/load/listaMatRes.json # assets/data/load/usuarios.json
