l10n daemon script beb35d8b8f 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"		2019-02-13 05:59:41 +01:00
..
contents/ui
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-13 05:59:41 +01:00