l10n daemon script 5cba424dc0 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-03-19 05:59:50 +01:00
..
contents/ui	[kcmkwin] Remove some name duplication in EffectModel	2019-03-18 13:10:33 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-03-19 05:59:50 +01:00