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"
Description
Description
Details
Details
- Committed
l10n daemon script <scripty@kde.org> Nov 13 2018, 7:24 AM - Parents
- R320:5043f66d17e1: [sftp] Add additional sftpProtocol::openConnection() for libssh 0.8.3+
- Branches
- Unknown
- Tags
- References
- tag: v18.11.80