Skip to content
Snippets Groups Projects
  • Alex Buts's avatar
    b2d505a9
    Re #11096 Merge branch 'master' into 11096/SumFilesAndDiagMultipleRuns · b2d505a9
    Alex Buts authored
    and fixing bugs introduced by merge
    
    Conflicts:
    	Code/Mantid/scripts/Inelastic/Direct/DirectEnergyConversion.py
    	Code/Mantid/scripts/Inelastic/Direct/PropertiesDescriptors.py
    	Code/Mantid/scripts/Inelastic/Direct/PropertyManager.py
    	Code/Mantid/scripts/Inelastic/Direct/ReductionWrapper.py
    	Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
    	Code/Mantid/scripts/test/DirectEnergyConversionTest.py
    	Code/Mantid/scripts/test/MariReduction.py
    	Code/Mantid/scripts/test/RunDescriptorTest.py
    b2d505a9
    History
    Re #11096 Merge branch 'master' into 11096/SumFilesAndDiagMultipleRuns
    Alex Buts authored
    and fixing bugs introduced by merge
    
    Conflicts:
    	Code/Mantid/scripts/Inelastic/Direct/DirectEnergyConversion.py
    	Code/Mantid/scripts/Inelastic/Direct/PropertiesDescriptors.py
    	Code/Mantid/scripts/Inelastic/Direct/PropertyManager.py
    	Code/Mantid/scripts/Inelastic/Direct/ReductionWrapper.py
    	Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
    	Code/Mantid/scripts/test/DirectEnergyConversionTest.py
    	Code/Mantid/scripts/test/MariReduction.py
    	Code/Mantid/scripts/test/RunDescriptorTest.py
Code owners
Assign users and groups as approvers for specific file changes. Learn more.