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
fd23e41df2
commit
bd9d49e82b
1 changed files with 3 additions and 0 deletions
Loading…
Reference in new issue