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/aacid/require_optional_dependencies
parent
715b8707b5
commit
7cd0d78b5c
17 changed files with 17 additions and 17 deletions
Loading…
Reference in new issue