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/work/svuorela/remove-write-only-variable-1
parent
864c623f28
commit
bf745445bf
36 changed files with 55 additions and 55 deletions
Loading…
Reference in new issue