autonomic-cooperative/ojuso-map
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Livvy Mackintosh 2017-09-22 16:29:54 +01:00 committed by GitHub
parent 141f3c8dea
commit 51c7ae127d
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
support/locale/es/LC_MESSAGES/django.po
View File

@ -7,15 +7,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "POT-Creation-Date: 2017-06-16 16:18+0000\n"
"PO-Revision-Date: 2017-09-22 15:06+0000\n" "PO-Revision-Date: 2017-09-22 15:06+0000\n"
"Last-Translator: Tom Wragg <tom@ojuso.org>\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/>" "Language-Team: Spanish <http://translate.ojuso.org/projects/platform/map/es/>"
"\n" "\n"
"Language: es\n" "Language: es\n"