l10n daemon script 27a3d33b91 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-20 01:17:33 +00:00
..
contents	Port away from the global "theme" object to PlasmaCore.Theme	2021-06-10 16:14:41 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-20 01:17:33 +00:00