l10n daemon script 68dfdefbda 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-10-20 02:06:33 +00:00
..
ui	quicksettings/record: Move record functions out of shellutil	2022-10-12 12:00:12 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-10-20 02:06:33 +00:00