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.14
parent
f17a395a40
commit
913b99840a
2 changed files with 3 additions and 0 deletions
Loading…
Reference in new issue