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 Jul 12 2020, 9:18 AM
Parents
rLIBKLEOe83f16587485: SVN_SILENT made messages (.desktop file) - always resolve ours
Branches
Unknown
Tags
Unknown
References
release/20.04

Event Timeline

l10n daemon script <scripty@kde.org> committed rLIBKLEO2883aec47795: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 12 2020, 9:18 AM