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

Authored by l10n daemon script <scripty@kde.org> on Thu, Jun 21, 5: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>Thu, Jun 21, 5:15 AM
Parents
R120:1894d888f726: Remove unused entry X-KDE-DBus-ModuleName from kded plugins' metadata
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:747591c15ee0: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Thu, Jun 21, 5:15 AM