Files
kdenlive/thumbnailer
l10n daemon script 3671ddc0a6 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-30 01:35:59 +00:00
..
2024-08-29 10:20:17 +00:00