shift-shell/look-and-feel
l10n daemon script 3ecc2844fb 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"
2022-05-27 01:43:07 +00:00
..
contents lockscreen: Port to kscreenlocker interface v3 and cleanup 2022-05-20 23:41:11 -04:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2022-05-27 01:43:07 +00:00