-
Committer:
l10n daemon script
-
Date:
2020-11-14 05:47:16 UTC
-
Revision ID:
git-v1:1ad0074b441a4cf907f4ef7619406888a3192843
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"