l10n daemon script 01f4cf59ea SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-11-04 17:07:45 +00:00
..
2015-02-17 18:40:49 +01:00
2014-05-19 18:29:41 +02:00
2014-07-16 17:02:01 +02:00
2014-10-15 15:45:29 +02:00