l10n daemon script fcc0b10fee 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"		2022-10-26 01:51:34 +00:00
..
contents/code
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-10-26 01:51:34 +00:00