l10n daemon script c71737436e 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-04-05 02:36:13 +00:00
..
contents/ui	mobileshellstate: Move to DBus API instead of trying to use shared QML context	2023-03-19 18:32:52 -07:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-04-05 02:36:13 +00:00