l10n daemon script 6364578281 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"		2022-08-04 01:46:56 +00:00
..
contents/ui	quicksettings: show SSID in wifi quick setting	2022-04-30 15:07:46 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-08-04 01:46:56 +00:00