l10n daemon script f3012a3eda 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-10-22 02:34:36 +00:00
..
quick-effect	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-10-22 02:34:36 +00:00