l10n daemon script 4daab15c23 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-07-11 01:49:02 +00:00
..
contents/ui	quicksettings/screenshot: Move C++ out of ShellUtil into package	2022-03-16 23:49:51 -04:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-07-11 01:49:02 +00:00