-
Committer:
l10n daemon script
-
Date:
2020-02-11 04:43:16 UTC
-
Revision ID:
git-v1:ebfd6f2268e184793a7ea4aab42d0bec5746ed8e
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"