-
Committer:
l10n daemon script
-
Date:
2019-07-18 03:23:23 UTC
-
Revision ID:
git-v1:46471a40dc7cb6b4072023ad3a93a72e2ebd9ff8
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"