l10n daemon script cc7fac30e8 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-11 02:59:39 +00:00
..
contents/ui	quicksettings/hotspot: add SSID in status	2023-03-07 17:09:01 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-03-11 02:59:39 +00:00