l10n daemon script e88082caf0 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"		2023-01-05 02:01:35 +00:00
..
contents/ui	taskpanel: Don't overlay over top panel	2022-12-11 15:06:24 -05:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-05 02:01:35 +00:00