shift-shell/quicksettings/kscreenosd/package
l10n daemon script d2e03281dc 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-08-20 01:36:17 +00:00
..
contents/ui kscreenosd quicksetting 2025-08-18 10:59:49 +02:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2025-08-20 01:36:17 +00:00