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> May 29 2018, 3:34 AM - Parents
- R875:0f1c46d0e760: Merge branch 'Falkon/3.0'
- Branches
- Unknown
- Tags