-
Committer:
l10n daemon script
-
Date:
2020-10-05 03:59:24 UTC
-
Revision ID:
git-v1:09dae61d1c7b919603c9d32c00f3d4cf909e687b
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"