-
Committer:
l10n daemon script
-
Date:
2020-07-13 03:23:34 UTC
-
Revision ID:
git-v1:9447d19234e3cc7b13059b634d3849049db8f4a6
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"