l10n daemon script 4c83a3e422 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"		2022-05-15 01:57:29 +00:00
..
contents/ui	kcm: Add vibration intensity and duration	2022-05-05 21:02:18 -04:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-05-15 01:57:29 +00:00