l10n daemon script b11d141169 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-01-16 10:59:59 +01:00
..
contents/ui	Add API for opening the KCM to daemon	2020-10-18 18:40:48 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-16 10:59:59 +01:00