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/downloadmanager
parent
82c8d50f9a
commit
aca5cb0e1c
1 changed files with 13 additions and 0 deletions
Loading…
Reference in new issue