-
Committer:
l10n daemon script
-
Date:
2019-08-30 03:28:09 UTC
-
Revision ID:
git-v1:880cdf6d1ee30deadc5847ffde1c5cdf7cdfc25b
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"