l10n daemon script 5e5752b8c4 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"		2021-12-31 01:42:54 +00:00
..
contents/ui	Port kwin from Plasma Components2	2021-03-27 23:26:31 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-31 01:42:54 +00:00