From fb6d404401598d3f31138133fee85611f004c5f5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 12 Apr 2023 12:46:37 +0200
Subject: [PATCH] refs #5213 no zona

---
 modules/client/front/locale/es.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/client/front/locale/es.yml b/modules/client/front/locale/es.yml
index 73cea83a7..625ce00a6 100644
--- a/modules/client/front/locale/es.yml
+++ b/modules/client/front/locale/es.yml
@@ -64,7 +64,4 @@ Compensation Account: Cuenta para compensar
 Amount to return: Cantidad a devolver
 Delivered amount: Cantidad entregada
 Unpaid: Impagado
-<<<<<<< HEAD
 There is no zona: No hay zona
-=======
->>>>>>> 736d0375f6b00d6eecb44c01ecc999c42dc219ae