-
Committer:
l10n daemon script
-
Date:
2020-11-08 05:13:31 UTC
-
Revision ID:
git-v1:ce0e51bf3824c6a505a15f88c028e7714f368d54
Tags: v20.11.90, v20.12.0, v20.12.2
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"