Files
l10n daemon script 0cd3b0d2c3 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-02-07 01:37:52 +00:00
..
2025-06-24 23:07:40 +02:00
2025-06-24 23:07:40 +02:00