From 02573174fcb9a5a3540a7532cd1cfa240539ff80 Mon Sep 17 00:00:00 2001
From: Sebastian Wolf <sebastian@ygriega.de>
Date: Sun, 19 Nov 2023 22:51:33 +0100
Subject: [PATCH] Minor tweaks for the new session timout setting

---
 translations/harbour-fernschreiber-es.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts
index 9cdc703..dd080b6 100644
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@@ -1756,6 +1756,7 @@
     </message>
     <message>
         <source>1 week</source>
+<<<<<<< HEAD
         <translation> 1 semana</translation>
     </message>
     <message>