l10n daemon script 2d6d0c6789 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-04-09 01:50:14 +00:00
..
contents/ui	kcm: Use MobileShellSettings rather than custom implementation	2022-04-06 22:54:35 -04:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-09 01:50:14 +00:00