l10n daemon script b9f9066880 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-07 02:21:44 +00:00
..
contents/ui	taskpanel: Try to ensure dimension bindings are always set	2022-04-07 22:08:36 -04:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-06-07 02:21:44 +00:00