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