l10n daemon script 23e500a273 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-12-05 05:13:10 +01:00
..
contents/code
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-05 05:13:10 +01:00