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> Jun 20 2017, 2:28 AM - Parents
- R242:87d5449480e6: Fix vlc tray icon margins
- Branches
- Unknown
- Tags