l10n daemon script 871a69824f 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"		2022-10-15 01:50:20 +00:00
..
contents/ui	homescreens/halcyon: Port to new app launch method	2022-10-12 17:01:03 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-10-15 01:50:20 +00:00