l10n daemon script a1da4b2925 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-01-06 01:59:48 +00:00
..
contents/ui	quicksettings/screenrotation: Move C++ out of ShellUtil into package	2022-03-17 00:33:13 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-06 01:59:48 +00:00