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
6e141c18c1
commit
7007a0d87d
5 changed files with 8 additions and 8 deletions
Loading…
Reference in new issue