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

Authored by l10n daemon script <scripty@kde.org> on Jan 14 2019, 4:39 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 14 2019, 4:39 AM
Parents
R120:235fa8107dab: [Digital Clock] Add ability to set a custom date format string
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:9a403be17867: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 14 2019, 4:39 AM