l10n daemon script 393047e905 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"		2021-07-25 01:14:39 +00:00
..
contents/ui	Make it possible for QuickSettings to be created in a KPackage	2021-07-21 13:36:43 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-25 01:14:39 +00:00