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 Jan 24 2021, 7:03 AM
Parents
rLIBKLEOabd30b1cf7b8: Use existing helper for removing duplicate keys
Branches
Unknown
Tags
Unknown

Event Timeline

l10n daemon script <scripty@kde.org> committed rLIBKLEO68576607f7aa: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 24 2021, 7:03 AM