l10n daemon script 8e13435ccb 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-29 02:17:10 +00:00
..
contents/ui	quicksettings: Add save and update timers so kcm ordering is always correct	2022-03-21 10:25:45 -04:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-29 02:17:10 +00:00