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 Thu, Apr 29, 3:19 AM
Parents
rLIBKLEOc2edbc858e12: Remove obsolete function
Branches
Unknown
Tags
Unknown
References
refs/keep-around/2e3675836957eb63ca2612b56c9a8bbafb7708e2

Event Timeline

l10n daemon script <scripty@kde.org> committed rLIBKLEO2e3675836957: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Thu, Apr 29, 3:19 AM