l10n daemon script c6dc3ed2cd 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-06-10 06:00:45 +02:00
..
contents/code
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-10 06:00:45 +02:00