l10n daemon script a1c0d43deb 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"		2020-07-23 06:10:20 +02:00
..
contents/ui	Merge branch 'Plasma/5.19'	2020-06-25 09:46:22 -06:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +02:00