l10n daemon script c5c2ce7535 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"		2019-08-06 04:59:39 +02:00
..
contents/ui	[kcmkwin/kwindesktop] Improve the look of the Virtual Desktops KCM UI	2019-08-05 16:58:21 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-06 04:59:39 +02:00