-
https://github.com/mantidproject/mantidNick Draper authored
# Conflicts: # Framework/API/inc/MantidAPI/AlgorithmProxy.h # Framework/API/src/AlgorithmProxy.cpp # Framework/API/test/AlgorithmProxyTest.h # Framework/PythonInterface/mantid/api/src/Exports/AlgorithmProxy.cpp
efeedfbb