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

Authored by l10n daemon script <scripty@kde.org> on Dec 26 2019, 4:33 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>Dec 26 2019, 4:33 AM
Parents
R119:bf1eb34cf7b4: [kicker] Fix a few unqualified property access
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:3309bfdc73bf: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 26 2019, 4:33 AM