From 141f3c8deaca2ce65064c686fedba315b384f0c7 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 22 Sep 2017 15:23:03 +0000
Subject: [PATCH] Fix merge conflict

---
 support/locale/es/LC_MESSAGES/django.po | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/support/locale/es/LC_MESSAGES/django.po b/support/locale/es/LC_MESSAGES/django.po
index aa5742d..ee99314 100644
--- a/support/locale/es/LC_MESSAGES/django.po
+++ b/support/locale/es/LC_MESSAGES/django.po
@@ -7,9 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2017-09-22 14:59+0000\n"
 "PO-Revision-Date: 2017-06-16 17:00+0000\n"
 "Last-Translator: Livvy <livvy@base.nu>\n"
+=======
+"POT-Creation-Date: 2017-06-16 16:18+0000\n"
+"PO-Revision-Date: 2017-09-22 15:06+0000\n"
+"Last-Translator: Tom Wragg <tom@ojuso.org>\n"
+>>>>>>> Manually commit changes from weblate
 "Language-Team: Spanish <http://translate.ojuso.org/projects/platform/map/es/>"
 "\n"
 "Language: es\n"
@@ -21,7 +27,7 @@ msgstr ""
 
 #: apps/map/templates/map/base.html:15 apps/map/templates/map/index.html:15
 msgid "Ojuso Platform Map"
-msgstr ""
+msgstr "Mapa del Plataforma Ojuso"
 
 #: apps/map/templates/map/form.html:15 apps/map/templates/map/index.html:108
 msgid "Submit a Case Study"