-
Committer:
l10n daemon script
-
Date:
2019-08-17 03:09:01 UTC
-
Revision ID:
git-v1:5a47e4e0a3209e2fc6ee2928b8a7920cf6ed1594
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"