l10n daemon script acc6431029 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-03-01 23:48:55 +00:00
..
contents/ui	components: Remove splash screen close button support, due to crashing problems	2023-02-14 23:07:38 -08:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-03-01 23:48:55 +00:00