Files
l10n daemon script a07d5d7994 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"
2025-11-27 01:36:28 +00:00
..
2019-04-15 22:36:34 +02:00