-
Committer:
l10n daemon script
-
Date:
2020-01-28 04:41:08 UTC
-
Revision ID:
git-v1:bc6cb50e00ecc3eef13f05ec7c1d3e14a690f2b9
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"