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.24
parent
00bf08a95f
commit
b28d5f6935
1 changed files with 2 additions and 0 deletions
Loading…
Reference in new issue