l10n daemon script 0a377632e4 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"		2017-09-03 04:42:56 +02:00
..
contents	Plasmoid templates: use the image which is part of the package (again)	2017-05-19 14:37:20 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-03 04:42:56 +02:00