Diffusion KWin 506b9b2866d2

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

Authored by l10n daemon script <scripty@kde.org> on Aug 20 2019, 3:07 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>Aug 20 2019, 3:07 AM
Parents
R108:2bf2a04f8660: Fix the build error in hwcomposer backend
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:506b9b2866d2: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 20 2019, 3:07 AM