l10n daemon script 2befb1f81c 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-09-05 09:38:26 +00:00
..
contents
metadata.desktop