l10n daemon script d9ed103196 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-10-20 05:22:16 +02:00
..
contents/code
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-20 05:22:16 +02:00