From 78a5c3895edda4fd6928e40d0536cf069587dbc1 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 22 Nov 2023 15:19:37 -0300
Subject: [PATCH] resolve conflict

---
 src/i18n/en/index.js | 3 ---
 src/i18n/es/index.js | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index f6be9a055..6fe7ac6f5 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -389,8 +389,6 @@ export default {
             shipped: 'Shipped',
             totalWithVat: 'Amount',
         },
-<<<<<<< Updated upstream
-=======
         globalInvoices: {
             errors: {
                 chooseValidClient: 'Choose a valid client',
@@ -408,7 +406,6 @@ export default {
                 streetAddress: 'Street',
             },
         },
->>>>>>> Stashed changes
     },
     worker: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 1349ef584..50c6b82b1 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -389,8 +389,6 @@ export default {
             shipped: 'F. envío',
             totalWithVat: 'Importe',
         },
-<<<<<<< Updated upstream
-=======
         globalInvoices: {
             errors: {
                 chooseValidClient: 'Selecciona un cliente válido',
@@ -410,7 +408,6 @@ export default {
                 streetAddress: 'Dirección fiscal',
             },
         },
->>>>>>> Stashed changes
     },
     worker: {
         pageTitles: {