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
c177a7f699
commit
3657f49534
4 changed files with 18 additions and 2 deletions
Loading…
Reference in new issue