From f3f0360059601b8c35cf31a01dd1ba0f31441910 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 20 Feb 2024 13:19:31 +0100
Subject: [PATCH] refs #5858 fix conflicts

---
 loopback/locale/es.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index d51dcb88d..247e0baae 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -346,5 +346,4 @@
     "CountryFK cannot be empty": "El país no puede estar vacío",
     "Cmr file does not exist": "El archivo del cmr no existe",
     "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
-    "No tickets to invoice": "No hay tickets para facturar"
 }