Branch: refs/heads/master Author: Andreas Ots andreasots@gmail.com Committer: Andreas Ots andreasots@gmail.com Date: Thu, 27 Dec 2012 13:31:00 UTC Commit: 8b9c9d8e432052dfe80b301a5220f8bafd659f4e https://github.com/geany/geany/commit/8b9c9d8e432052dfe80b301a5220f8bafd659f...

Log Message: ----------- po/et.po: Header fix

Modified Paths: -------------- po/et.po

Modified: po/et.po 6 files changed, 1 insertions(+), 5 deletions(-) =================================================================== @@ -8,11 +8,7 @@ msgstr "" "Project-Id-Version: geany 1.22\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-26 18:25+0200\n" -<<<<<<< HEAD -"PO-Revision-Date: 2012-12-27 15:25+0300\n" -======= -"PO-Revision-Date: 2012-12-27 13:23+0300\n" ->>>>>>> 4e950a39db1bb046572b0d1c7ba1be922f3969e6 +"PO-Revision-Date: 2012-12-27 13:25+0300\n" "Last-Translator: Andreas Ots andreasots@gmail.com\n" "Language-Team: Estonian\n" "Language: et\n"

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).