Commit d67f270e58942fed5871eca6802d3fa4f290e4f1

Edward Thomson 2015-05-14T13:30:29

index: validate mode of new conflicts