l10n daemon script c240755dee 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"		2016-06-23 23:41:42 +00:00
..
contents/code
metadata.desktop