l10n daemon script a34edfa861 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-01 05:00:13 +02:00
..
contents	Remove dead code	2019-07-05 14:38:07 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-01 05:00:13 +02:00