-
Committer:
l10n daemon script
-
Date:
2020-04-09 04:21:49 UTC
-
Revision ID:
git-v1:1a06a95c7f14e3147110f9a244ca40fd8c1be295
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"