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

Authored by l10n daemon script <scripty@kde.org> on Nov 1 2018, 4:58 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>Nov 1 2018, 4:58 AM
Parents
R120:e53e3e170148: [ksmserver] Fix session restore check
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:ca92fb827d8b: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 1 2018, 4:58 AM