Diffusion KDb 1f5319c47074

SVN_SILENT made messages (.desktop file) - always resolve ours

Authored by l10n daemon script <scripty@kde.org> on Jan 6 2018, 3:47 AM.

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

Committed
l10n daemon script <scripty@kde.org>Jan 6 2018, 3:47 AM
Parents
R15:9a6bd08b1196: GIT_SILENT Improve docs for KDbQuerySchema
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R15:1f5319c47074: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 6 2018, 3:47 AM