Files
kdeconnect-kde/plasmoid
l10n daemon script 8ca1e316c2 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-09-28 01:36:59 +00:00
..
2023-12-23 16:34:33 +00:00