2 Commits (556ca0690674f5e5376b721c2ea4985c7b1d5718)

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