-
Committer:
l10n daemon script
-
Date:
2018-03-13 04:16:21 UTC
-
Revision ID:
git-v1:677a5b5738eb99e3b08294dca8a06653e3d09ab5
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"