l10n daemon script a63dcf2d9b 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-11-16 01:24:30 +00:00
..
contents/ui	units -> PlasmaCore.Units	2021-09-13 18:59:35 +02:00
Messages.sh	new applet to access KRunner functions	2020-02-05 19:57:44 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-11-16 01:24:30 +00:00