Files
kdenlive/data
l10n daemon script 1fd473e180 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"
2023-12-04 01:16:19 +00:00
..
2023-03-04 17:03:32 +01:00
2023-10-22 00:43:01 +02:00
2023-08-06 14:06:28 +02:00