-
Committer:
l10n daemon script
-
Date:
2022-06-07 02:04:49 UTC
-
Revision ID:
git-v1:2c00f5ce470b36defcf49dfbaac35df5d088fab4
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"