From 550207ab0c1adcd44116de30b4c619a6019830d5 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Thu, 27 Aug 2020 12:55:16 +0100
Subject: [PATCH] L10n/es.strings: Accidental ">>>>>>> develop" left in

---
 L10n/es.strings | 1 -
 1 file changed, 1 deletion(-)

diff --git a/L10n/es.strings b/L10n/es.strings
index 31b4234e..8dc4eb49 100644
--- a/L10n/es.strings
+++ b/L10n/es.strings
@@ -236,7 +236,6 @@
 "Language" = "Idioma";
 
 /* [EDMarketConnector.py] - Leave '%H:%M:%S' as-is */
->>>>>>> develop
 "Last updated at %H:%M:%S" = "Última actualización: %H:%M:%S";
 
 /* Federation rank. [stats.py] */