Diffusion KIO 2788393c569d

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

Authored by l10n daemon script <scripty@kde.org> on May 18 2018, 3:40 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>May 18 2018, 3:40 AM
Parents
R241:fc6b85b832c7: [KUrlNavigator] Emit tabRequested when path in path selector menu is middle…
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R241:2788393c569d: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 18 2018, 3:40 AM