From 9686075104c4691fb311df6ad7cf21d0e08cb692 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Thu, 18 Sep 2025 12:02:14 +0200
Subject: [PATCH] :bug: Fix translations

---
 frontend/translations/es.po | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/translations/es.po b/frontend/translations/es.po
index d2f057af9c..b9b84ce344 100644
--- a/frontend/translations/es.po
+++ b/frontend/translations/es.po
@@ -1906,7 +1906,6 @@ msgstr "Visibilidad"
 #: src/app/main/ui/inspect/right_sidebar.cljs:165
 msgid "inspect.tabs.switcher.label"
 msgstr "Información sobre la capa"
->>>>>>> origin/staging
 
 #: src/app/main/ui/dashboard/comments.cljs:95
 msgid "label.mark-all-as-read"