verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

7167-testToMaster_2414 #2244

Merged
alexm merged 643 commits from 7167-testToMaster_2414 into master 2024-04-04 05:32:41 +00:00
Conversation 0 Commits 643 Files Changed 208 +1 -5
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 92b4908b35 - Show all commits

6
loopback/locale/es.json
View File

@ -330,10 +330,6 @@
"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
<<<<<<< HEAD
"The line could not be marked": "The line could not be marked"
}
=======
"The line could not be marked": "The line could not be marked",
"This user does not have an assigned tablet": "Este usuario no tiene tablet asignada"
}
>>>>>>> 0101dcda3ac950c1add6c3c426c4f745389805c1