l10n daemon script 430ca2a33e 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-06-18 08:32:20 +02:00
..
contents/ui	[kcmkwin/kwindecoration] Don't exec() QDialog	2020-05-06 15:15:03 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 08:32:20 +02:00