kwin/scripts/desktopchangeosd
l10n daemon script b6f22a98a7 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"
2018-06-18 07:51:12 +02:00
..
contents/ui Adding more frameless hints 2016-08-11 08:45:41 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:51:12 +02:00