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

Authored by l10n daemon script <scripty@kde.org> on Feb 25 2018, 4:32 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>Feb 25 2018, 4:32 AM
Parents
R120:b17fa4bea6f4: parent full representation to the proper window at start
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:5cff4a6e4c19: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Feb 25 2018, 4:32 AM