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> Jan 9 2018, 4:06 AM - Parents
- R108:7ca8771d129f: [TabBox] Don't show "Show desktop" window when cycling through application…
- Branches
- Unknown
- Tags