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: {

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: {