Files
l10n daemon script 25eefe30d9 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"
2026-09-23 01:55:54 +00:00
..
2023-12-23 16:34:33 +00:00