l10n daemon script 201ba6959d 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-09-11 01:44:12 +00:00
..
contents/ui	quicksettings/record: Update quicksetting labels	2022-08-16 22:44:20 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-09-11 01:44:12 +00:00