Framework/API/test/MatrixWorkspaceTest.h · 13688e63ed16f3b470c80d5ed23917a3f15b49cd · mantidproject / mantid

8 years ago

Refs #15827 Resolved merge conflict in MonteCarloAbsorption · ba5ad8a2

Ian Bush authored 8 years ago

Merge remote-tracking branch 'origin/master' into 15827_isDistribution_setter_name_on_MatrixWorkspace

Conflicts:
	Framework/Algorithms/src/MonteCarloAbsorption.cpp

ba5ad8a2

History

Refs #15827 Resolved merge conflict in MonteCarloAbsorption

Ian Bush authored 8 years ago

Merge remote-tracking branch 'origin/master' into 15827_isDistribution_setter_name_on_MatrixWorkspace

Conflicts:
	Framework/Algorithms/src/MonteCarloAbsorption.cpp

Code owners

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