-
Committer:
l10n daemon script
-
Date:
2019-08-07 03:04:32 UTC
-
Revision ID:
git-v1:346e713affbfdb8e1a4f762a56c2af08fc64d970
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"