l10n daemon script 7224c92caf 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-10-30 01:23:46 +00:00

13 KiB

Raw Blame History

View Raw