-
Richard Waite authored
Merge branch '28339_ellipsoid_integration_in_IntegratePeaksMD' of https://github.com/mantidproject/mantid into 28339_ellipsoid_integration_in_IntegratePeaksMD merge with remote after resolving a conflict on github
679e419d
Merge branch '28339_ellipsoid_integration_in_IntegratePeaksMD' of https://github.com/mantidproject/mantid into 28339_ellipsoid_integration_in_IntegratePeaksMD merge with remote after resolving a conflict on github