diff options
Diffstat (limited to 'locale/es/app.po')
| -rw-r--r-- | locale/es/app.po | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/locale/es/app.po b/locale/es/app.po index e38669b7b..f9995d57b 100644 --- a/locale/es/app.po +++ b/locale/es/app.po @@ -12,15 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -<<<<<<< HEAD "POT-Creation-Date: 2012-12-18 10:11+0000\n" "PO-Revision-Date: 2012-12-18 10:14+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" -======= -"POT-Creation-Date: 2012-11-06 16:35+0000\n" -"PO-Revision-Date: 2012-11-29 00:22+0000\n" -"Last-Translator: David Cabo <david.cabo@gmail.com>\n" ->>>>>>> hotfix/0.6.8.3 "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" |