l10n daemon script adf9cb767d 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"		2018-05-18 05:45:28 +02:00
..
contents/code
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-18 05:45:28 +02:00