l10n daemon script a9bab2af9d 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-05-23 03:30:47 +00:00
..
contents/ui	initialstart: Add first login experience	2023-04-01 07:09:57 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-05-23 03:30:47 +00:00