l10n daemon script 2f6e9a6355 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"		2020-03-27 06:43:00 +01:00
..
contents/ui	KCM KWinDecoration port to KConfigXT	2020-01-14 11:01:10 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-27 06:43:00 +01:00