l10n daemon script b993b510a4 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"		2024-12-15 01:40:00 +00:00
..
contents/ui
metadata.json