wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

resolve conflict

This commit is contained in:
William Buezas 2023-11-22 15:19:37 -03:00
parent 14788b7f7c
commit 78a5c3895e
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/i18n/en/index.js
View File

@ -389,8 +389,6 @@ export default {
shipped: 'Shipped', shipped: 'Shipped',
totalWithVat: 'Amount', totalWithVat: 'Amount',
}, },
<<<<<<< Updated upstream
=======
globalInvoices: { globalInvoices: {
errors: { errors: {
chooseValidClient: 'Choose a valid client', chooseValidClient: 'Choose a valid client',
@ -408,7 +406,6 @@ export default {
streetAddress: 'Street', streetAddress: 'Street',
}, },
}, },
>>>>>>> Stashed changes
}, },
worker: { worker: {
pageTitles: { pageTitles: {

3
src/i18n/es/index.js
View File

@ -389,8 +389,6 @@ export default {
shipped: 'F. envío', shipped: 'F. envío',
totalWithVat: 'Importe', totalWithVat: 'Importe',
}, },
<<<<<<< Updated upstream
=======
globalInvoices: { globalInvoices: {
errors: { errors: {
chooseValidClient: 'Selecciona un cliente válido', chooseValidClient: 'Selecciona un cliente válido',
@ -410,7 +408,6 @@ export default {
streetAddress: 'Dirección fiscal', streetAddress: 'Dirección fiscal',
}, },
}, },
>>>>>>> Stashed changes
}, },
worker: { worker: {
pageTitles: { pageTitles: {