l10n daemon script 2a07aa238f 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"		2024-01-13 01:15:23 +00:00
..
quick-effect	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-01-13 01:15:23 +00:00