kwin/scripts/desktopchangeosd
l10n daemon script f1bbe935d3 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"
2019-08-07 05:12:10 +02:00
..
contents/ui [desktopchangeosd] Sync desktop switch OSD font size to Plasma OSD font size 2018-10-28 16:46:50 +00:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-08-07 05:12:10 +02:00