l10n daemon script a4a671d587 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"		2026-04-10 01:59:12 +00:00
..
contents	panels: Add support for defining device specific panel tweaks	2025-11-04 23:08:18 -05:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2026-04-10 01:59:12 +00:00