-
Nick Draper authored
re #15450 # Conflicts: # Framework/API/inc/MantidAPI/MatrixWorkspace.h # Framework/API/src/MatrixWorkspace.cpp # Framework/Algorithms/src/GeneratePeaks.cpp # Framework/Algorithms/src/GetEi.cpp # Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h # Framework/DataHandling/src/EventWorkspaceCollection.cpp # Framework/DataHandling/test/LoadISISNexusTest.h
1c21c454