l10n daemon script 824ef8a74e 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"		2023-01-04 02:02:56 +00:00
..
contents/code
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-04 02:02:56 +00:00