l10n daemon script cdfc7512aa 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"
2020-09-08 06:34:57 +02:00
..
2020-01-23 11:22:16 +01:00
2020-02-13 18:18:09 +01:00
2020-08-31 10:18:22 +00:00