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 Jun 13 2022, 4:33 AM
Parents
rLIBKLEOb8a0ab7d8d3a: Bump library version
Branches
Unknown
Tags
Unknown

Event Timeline

l10n daemon script <scripty@kde.org> committed rLIBKLEOf56a6ada9837: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jun 13 2022, 4:33 AM