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"remotes/origin/fredrik/linux-dmabuf
parent
c601e875cf
commit
049b34c050
1 changed files with 1 additions and 0 deletions
Loading…
Reference in new issue