Re #16011 Fix merge conflict for pull request
No related branches found
No related tags found
Showing
- Framework/API/inc/MantidAPI/ITableWorkspace.h 1 addition, 2 deletionsFramework/API/inc/MantidAPI/ITableWorkspace.h
- Framework/API/inc/MantidAPI/WorkspaceProperty.h 3 additions, 3 deletionsFramework/API/inc/MantidAPI/WorkspaceProperty.h
- Framework/API/src/Algorithm.cpp 8 additions, 10 deletionsFramework/API/src/Algorithm.cpp
- Framework/API/src/AlgorithmFactory.cpp 4 additions, 4 deletionsFramework/API/src/AlgorithmFactory.cpp
- Framework/API/src/AlgorithmHistory.cpp 4 additions, 5 deletionsFramework/API/src/AlgorithmHistory.cpp
- Framework/API/src/AlgorithmManager.cpp 6 additions, 6 deletionsFramework/API/src/AlgorithmManager.cpp
- Framework/API/src/AnalysisDataService.cpp 2 additions, 2 deletionsFramework/API/src/AnalysisDataService.cpp
- Framework/API/src/Column.cpp 1 addition, 1 deletionFramework/API/src/Column.cpp
- Framework/API/src/CompositeFunction.cpp 1 addition, 1 deletionFramework/API/src/CompositeFunction.cpp
- Framework/API/src/DataProcessorAlgorithm.cpp 2 additions, 2 deletionsFramework/API/src/DataProcessorAlgorithm.cpp
- Framework/API/src/ExperimentInfo.cpp 4 additions, 5 deletionsFramework/API/src/ExperimentInfo.cpp
- Framework/API/src/Expression.cpp 2 additions, 2 deletionsFramework/API/src/Expression.cpp
- Framework/API/src/FileFinder.cpp 1 addition, 1 deletionFramework/API/src/FileFinder.cpp
- Framework/API/src/FileLoaderRegistry.cpp 5 additions, 7 deletionsFramework/API/src/FileLoaderRegistry.cpp
- Framework/API/src/FrameworkManager.cpp 10 additions, 12 deletionsFramework/API/src/FrameworkManager.cpp
- Framework/API/src/GroupingLoader.cpp 1 addition, 1 deletionFramework/API/src/GroupingLoader.cpp
- Framework/API/src/IEventWorkspace.cpp 1 addition, 1 deletionFramework/API/src/IEventWorkspace.cpp
- Framework/API/src/IFuncMinimizer.cpp 1 addition, 2 deletionsFramework/API/src/IFuncMinimizer.cpp
- Framework/API/src/IFunction.cpp 8 additions, 11 deletionsFramework/API/src/IFunction.cpp
- Framework/API/src/IFunctionMD.cpp 1 addition, 1 deletionFramework/API/src/IFunctionMD.cpp
Loading
Please register or sign in to comment