l10n daemon script c2474b385e 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-03-19 01:43:02 +00:00
..
contents/ui	quicksettings: Move all quick settings to kpackage	2022-03-16 23:20:51 -04:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-19 01:43:02 +00:00