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"remotes/origin/Plasma/5.15
l10n daemon script
7 years ago
parent
6e1655e3cc
commit
8e35cabd42
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue