Home GnuPG

SVN_SILENT made messages (.desktop file) - always resolve ours

Description

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"

Details

Provenance
l10n daemon script <scripty@kde.org>Authored on Nov 11 2023, 2:19 AM
Parents
rLIBKLEOd2c86206efe9: Use QuickJob instead of DefaultKeyGenerationJob for generating key
Branches
Unknown
Tags
Unknown

Event Timeline

l10n daemon script <scripty@kde.org> committed rLIBKLEO9bf2cb1b2947: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 11 2023, 2:19 AM