l10n daemon script 9655dcdc6d 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-07-23 01:48:30 +00:00
..
contents/ui	homescreens/halcyon: Two column layout, and refactor	2022-06-28 00:43:40 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-07-23 01:48:30 +00:00