l10n daemon script ead62a26cc 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-06-18 03:45:48 +00:00
..
contents/ui	quicksettings/hotspot: add settingsCommand	2023-03-20 11:56:06 +01:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-06-18 03:45:48 +00:00