Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix fatal error when there are conflicts (introduced in a recent merge).
- Loading branch information