-
Committer:
l10n daemon script
-
Date:
2019-12-08 04:33:29 UTC
-
Revision ID:
git-v1:9213a13f206c81b868f3c2eb70e215fbb9a1c9a8
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"