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
6e5c9e9b16
commit
e34588609e
1 changed files with 1 additions and 0 deletions
Loading…
Reference in new issue