-
Committer:
l10n daemon script
-
Date:
2019-11-28 04:51:13 UTC
-
Revision ID:
git-v1:c3f904b334afef89d0cf00e1b32d0e49df3e4838
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"