Files
l10n daemon script 12c5a4fcc8 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-09-08 01:50:37 +00:00
..
2025-06-24 23:07:40 +02:00
2025-06-17 23:29:23 +02:00