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

Authored by l10n daemon script <scripty@kde.org> on Jan 29 2018, 6:15 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 29 2018, 6:15 AM
Parents
R120:5e230a6290b1: [Notifications] Unset Heading default height
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:265ab9596548: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 29 2018, 6:15 AM