l10n daemon script e11f31f48d 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-09-20 01:50:04 +00:00
..
contents/ui	homescreens/halcyon: Use reuseItems on app list	2022-09-18 00:00:28 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-09-20 01:50:04 +00:00