-
Committer:
l10n daemon script
-
Date:
2019-11-12 04:35:38 UTC
-
Revision ID:
git-v1:9d80a56e71ad2d5b4d982b459b6d0feeb1138e32
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"