-
Committer:
l10n daemon script
-
Date:
2019-07-12 03:18:35 UTC
-
Revision ID:
git-v1:5f2b1fc8bb26ce9445f745586d0309c62b53e107
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"