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
dda29726a0
commit
3f5f9d09f7
1 changed files with 2 additions and 2 deletions
Loading…
Reference in new issue