Code/Mantid/docs/source/algorithms/UpdateInstrumentFromFile-v1.rst · ae2118ed09902e3b8582cf68f54f77cfef2dad5f · mantidproject / mantid

10 years ago

refs #9581 updated branch to master and fixing merge conflicts · 4fb55151

Alex Buts authored 10 years ago

caused by the documentation changes.

Merge branch 'master' into feature/9581_SphinxChanges

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDParent.cpp
	Code/Mantid/docs/source/algorithms/DetectorEfficiencyCor-v1.rst
	Code/Mantid/docs/source/algorithms/LoadInstrument-v1.rst
	Code/Mantid/docs/source/algorithms/MergeMD-v1.rst
	Code/Mantid/docs/source/algorithms/OneStepMDEW-v1.rst
	Code/Mantid/docs/source/algorithms/UpdateInstrumentFromFile-v1.rst

4fb55151

History

refs #9581 updated branch to master and fixing merge conflicts

Alex Buts authored 10 years ago

caused by the documentation changes.

Merge branch 'master' into feature/9581_SphinxChanges

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDParent.cpp
	Code/Mantid/docs/source/algorithms/DetectorEfficiencyCor-v1.rst
	Code/Mantid/docs/source/algorithms/LoadInstrument-v1.rst
	Code/Mantid/docs/source/algorithms/MergeMD-v1.rst
	Code/Mantid/docs/source/algorithms/OneStepMDEW-v1.rst
	Code/Mantid/docs/source/algorithms/UpdateInstrumentFromFile-v1.rst

Code owners

Assign users and groups as approvers for specific file changes. Learn more.