shift-shell/quicksettings/kscreenosd/package
l10n daemon script fb082759e1 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"
2026-01-29 01:40:16 +00:00
..
contents/ui fix kscreenosd quicksetting 2025-08-21 11:54:26 +02:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2026-01-29 01:40:16 +00:00