l10n daemon script b4af02e227 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-03-02 01:28:49 +00:00
..
contents/ui	taskswitcher: Switch to declarative effect	2025-03-01 21:26:47 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2025-03-02 01:28:49 +00:00