-
Committer:
l10n daemon script
-
Date:
2019-11-15 04:28:08 UTC
-
Revision ID:
git-v1:05820dec7efc98d5edf23c6464732195f335bf19
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"