shift-shell/quicksettings/record/package
l10n daemon script 64b32ea3d0 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-01-10 02:00:34 +00:00
..
contents SVN_SILENT made messages (.desktop file) - always resolve ours 2023-01-10 02:00:34 +00:00