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.11
parent
d71792378e
commit
880d0afcf1
2 changed files with 2 additions and 0 deletions
Loading…
Reference in new issue