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
244fdf477c
commit
0aa8fbec61
5 changed files with 5 additions and 3 deletions
Loading…
Reference in new issue