l10n daemon script f2cedc32b6 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-08-15 02:14:27 +00:00
..
contents/ui	homescreens/halcyon: Update to latest unit sizing	2023-07-24 22:46:21 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-08-15 02:14:27 +00:00