Diffusion KWin c5c2ce753500

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

Authored by l10n daemon script <scripty@kde.org> on Aug 6 2019, 2:59 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 6 2019, 2:59 AM
Parents
R108:ee05fd4dc7f8: [kcmkwin/kwindesktop] Improve the look of the Virtual Desktops KCM UI
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:c5c2ce753500: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 6 2019, 2:59 AM