Christophe Coevoet 8c3898aa57 Update tests for replace conflicts ... This reverts the test changes done in b4698568d2 to the original tests added in 1425bb7fc3.		2018-08-27 12:14:34 +02:00
..
functional	images related to new trusty images	2017-06-22 15:20:19 +02:00
installer	Update tests for replace conflicts	2018-08-27 12:14:34 +02:00