Diffusion KWin 433a121838db

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

Authored by l10n daemon script <scripty@kde.org> on Jan 25 2019, 7:42 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 25 2019, 7:42 AM
Parents
R108:8fd041818748: Keep _NET_DESKTOP_NAMES in sync
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:433a121838db: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 25 2019, 7:42 AM