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, Mar 13, 2:31 AM
Parents
rLIBKLEO5d4df6b63548: Use standard formatting for keys in KeySelectionCombo
Branches
Unknown
Tags
Unknown

Event Timeline

l10n daemon script <scripty@kde.org> committed rLIBKLEO0eb8544c53d5: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Thu, Mar 13, 2:31 AM