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.17
parent
f838b06bda
commit
ce72de243a
7 changed files with 9 additions and 0 deletions
Loading…
Reference in new issue