-
Committer:
l10n daemon script
-
Date:
2020-02-12 05:08:32 UTC
-
Revision ID:
git-v1:982e0eda94a934d237a52c4d4f3359ff0f633a98
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"