-
Committer:
l10n daemon script
-
Date:
2021-01-14 06:06:51 UTC
-
Revision ID:
git-v1:ddab4058e1b468479ca57a6113f42160458bc4af
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"