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
7fa17f6bc9
commit
1affa79c81
2 changed files with 2 additions and 0 deletions
Loading…
Reference in new issue