l10n daemon script cb307e16b2 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-11-17 05:06:27 +01:00
..
contents/ui	plasmoid: move plasmoid buttons into a menu	2019-10-12 20:06:12 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-17 05:06:27 +01:00