-
Committer:
l10n daemon script
-
Date:
2020-06-18 03:32:49 UTC
-
Revision ID:
git-v1:1ab6eb162cf52c6f20d9b777c0f33110f73348a1
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"