l10n daemon script 9d7881f3c9 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-24 01:48:25 +00:00
..
contents/ui	taskpanel: Remove keyboard button setting, only show when unsupported	2022-09-12 08:12:24 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-09-24 01:48:25 +00:00