l10n daemon script dbe069edfa 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-12-17 02:07:26 +00:00
..
contents/ui	homescreens/folio: Add title to import file dialog	2023-12-14 23:04:25 -08:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-17 02:07:26 +00:00