l10n daemon script 038356e752 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"		2023-09-02 01:38:48 +00:00
..
contents/ui	Changed KCM to launch in system settings	2023-07-30 07:30:52 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-09-02 01:38:48 +00:00