l10n daemon script c2b3e3cfc8 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-23 02:52:45 +00:00
..
contents/ui	quicksettings: Extract out from mobileshell into separate plugin	2023-03-16 19:44:36 -07:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-03-23 02:52:45 +00:00