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
8f369bfba6
commit
faad339db5
131 changed files with 197 additions and 8 deletions
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue