Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py · 3865d944ca6324946174fbb99d04f3d3d7f1af7a · mantidproject / mantid

"Framework/git@code.ornl.gov:mantidproject/mantid.git" did not exist on "c5e77ee7d4aea9398f04ed0963d364030ecc3159"

10 years ago

Re #11096 Merge branch 'master' into 11096/SumFilesAndDiagMultipleRuns · 3865d944

Alex Buts authored 10 years ago

Conflicts:
	Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
	Code/Mantid/scripts/test/DirectEnergyConversionTest.py
	Code/Mantid/scripts/test/DirectPropertyManagerTest.py
	Code/Mantid/scripts/test/MariReduction.py
	Code/Mantid/scripts/test/RunDescriptorTest.py

3865d944

History

Re #11096 Merge branch 'master' into 11096/SumFilesAndDiagMultipleRuns

Alex Buts authored 10 years ago

Conflicts:
	Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
	Code/Mantid/scripts/test/DirectEnergyConversionTest.py
	Code/Mantid/scripts/test/DirectPropertyManagerTest.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.