l10n daemon script e06c2d2f93 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"

2024-01-09 02:06:01 +00:00

9.6 KiB

Raw Blame History

View Raw