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-5.26
parent
7c6e36600d
commit
8766314279
1 changed files with 2 additions and 2 deletions
Loading…
Reference in new issue