2 Commits (d19f5db56810b58b15b5263ce4c1d4181de3f896)

Author	SHA1	Message	Date
Jordi Boggiano	ec90c17e3b	Fix conflict order to be more accurate	2020-01-30 15:55:37 +01:00
Jordi Boggiano	3fc7e10c5c	Improve error reporting of solver issues, refs #7779 ... Fixes #8525 Fixes #6513	2020-01-30 14:43:54 +01:00