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"wilder/Plasma/6.2
parent
cc2e6fc96c
commit
7c9fb68b14
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue