l10n daemon script 9d284e4aa1 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"		2025-04-15 01:29:59 +00:00
..
contents/ui	shell: Remove nonexistent tabbar property in Panel	2025-03-19 15:52:50 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2025-04-15 01:29:59 +00:00