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/new-html5-permissions
parent
242c52e93b
commit
1ccd81ecf1
6 changed files with 7 additions and 0 deletions
Loading…
Reference in new issue