l10n daemon script 45cdc532f3 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-22 02:02:20 +00:00
..
contents/ui	mobileshell: Refactor and extract state to mobileshellstate plugin	2022-11-12 11:15:36 -05:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-22 02:02:20 +00:00