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/zzag/port-minimizeanimation-to-javascript
parent
1115ca8490
commit
fe430b12e8
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue