l10n daemon script 3a9b60f350 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-13 01:46:19 +00:00
..
contents	homescreens/folio: Rename from default	2022-09-11 20:01:23 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-09-13 01:46:19 +00:00