-
Committer:
l10n daemon script
-
Date:
2020-06-18 03:33:08 UTC
-
Revision ID:
git-v1:13e703a1bf45db3d00bd7830194ee257f26ee9f9
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"