Skip to content
Snippets Groups Projects
Commit 1691e8f6 authored by Owen Arnold's avatar Owen Arnold
Browse files

refs #11304. Fix merge conflict with master. 

Merge branch 'master' into 11304_createmd

Conflicts:
	Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
parents 5a1db129 854fdd81
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 115 additions and 40 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment