l10n daemon script cae02350d8 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-18 01:58:14 +00:00
..
contents	mobileshellstate: Heavily refactor to remove global shell margins to fix window binding loops	2022-12-10 21:05:13 -05:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-18 01:58:14 +00:00