-
Committer:
l10n daemon script
-
Date:
2020-03-29 05:08:41 UTC
-
Revision ID:
git-v1:1d9ac5fdf6c55c6d0d706c9a1813927ac942a1e3
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"