-
Committer:
l10n daemon script
-
Date:
2022-03-26 01:44:25 UTC
-
Revision ID:
git-v1:201fb2c8d3c57ca3d7af70e92662ba18fd2d3165
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"