-
Committer:
l10n daemon script
-
Date:
2019-11-06 04:36:42 UTC
-
Revision ID:
git-v1:3177c036cf57bd4e79de43d76ecada349f101ee8
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"