-
Committer:
l10n daemon script
-
Date:
2019-02-17 04:37:05 UTC
-
Revision ID:
git-v1:96a6a50bd044646d936e511ccd52dd8da0f3b0e2
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"