From d8bc37b627676490de7e23bf5fed8a9f35ededf5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 5 Feb 2025 15:38:54 +0100
Subject: [PATCH] style: refs #6321 i18n es

---
 src/pages/Ticket/locale/es.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 1817284b6..021e82d6a 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -215,7 +215,6 @@ ticketList:
     toLines: Ir a lineas
     addressNickname: Alias consignatario
     ref: Referencia
-<<<<<<< HEAD
 negative:
     hour: 'Hora'
     id: 'Id Articulo'
@@ -291,11 +290,9 @@ negative:
         newTicket: Ticket nuevo
         status: Estado
         message: Mensaje
-=======
     rounding: Redondeo
     noVerifiedData: Sin datos comprobados
     purchaseRequest: Petición de compra
     notVisible: No visible
     clientFrozen: Cliente congelado
     componentLack: Faltan componentes
->>>>>>> a338dbed70ac0386f410ac76c5a8ff64228f3251