l10n daemon script e5546c9236 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-02-09 05:53:12 +01:00
..
contents/ui	[KCM/Desktop] Port from KQuickAddons::ConfigModule to ManagedConfigModule	2019-12-23 13:22:36 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-09 05:53:12 +01:00