-
Karl Palmen authored
Conflicts: Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp Code/Mantid/Framework/DataHandling/src/SaveNexusProcessed.cpp Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h Code/Mantid/Framework/DataObjects/src/PeaksWorkspace.cpp Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
6d59e0a8