l10n daemon script cfaf383f89 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-06 05:47:09 +02:00
..
2020-09-01 02:09:43 +02:00