-
Committer:
l10n daemon script
-
Date:
2019-11-12 04:34:54 UTC
-
Revision ID:
git-v1:7e03fb413bc0678208561869d28d76fe4379d9b2
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"