l10n daemon script 56c732829f 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-11-16 02:15:19 +00:00
..
quick-effect	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-11-16 02:15:19 +00:00