Resolve merge conflict in documentation
Refs #16431
Showing
- Framework/Algorithms/src/ReflectometryWorkflowBase.cpp 2 additions, 2 deletionsFramework/Algorithms/src/ReflectometryWorkflowBase.cpp
- Framework/DataHandling/src/LoadMuonNexus.cpp 7 additions, 4 deletionsFramework/DataHandling/src/LoadMuonNexus.cpp
- Framework/DataHandling/src/LoadMuonNexus1.cpp 40 additions, 2 deletionsFramework/DataHandling/src/LoadMuonNexus1.cpp
- Framework/MDAlgorithms/src/ConvertToMD.cpp 9 additions, 0 deletionsFramework/MDAlgorithms/src/ConvertToMD.cpp
- Framework/MDAlgorithms/test/ConvertToMDTest.h 108 additions, 0 deletionsFramework/MDAlgorithms/test/ConvertToMDTest.h
- MantidPlot/src/Mantid/ErrorBarSettings.h 1 addition, 0 deletionsMantidPlot/src/Mantid/ErrorBarSettings.h
- MantidPlot/src/Mantid/MantidMDCurve.cpp 11 additions, 0 deletionsMantidPlot/src/Mantid/MantidMDCurve.cpp
- MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IqtFit.h 1 addition, 0 deletions...Interfaces/inc/MantidQtCustomInterfaces/Indirect/IqtFit.h
- MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp 20 additions, 0 deletionsMantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp
- MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp 14 additions, 4 deletionsMantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp
- MantidQt/CustomInterfaces/src/Muon/MuonAnalysisHelper.cpp 14 additions, 2 deletionsMantidQt/CustomInterfaces/src/Muon/MuonAnalysisHelper.cpp
- MantidQt/CustomInterfaces/src/SampleTransmission.cpp 12 additions, 3 deletionsMantidQt/CustomInterfaces/src/SampleTransmission.cpp
- MantidQt/CustomInterfaces/test/MuonAnalysisHelperTest.h 21 additions, 0 deletionsMantidQt/CustomInterfaces/test/MuonAnalysisHelperTest.h
- Testing/SystemTests/tests/analysis/OFFSPECReflRedOneAuto.py 3 additions, 0 deletionsTesting/SystemTests/tests/analysis/OFFSPECReflRedOneAuto.py
- Testing/SystemTests/tests/analysis/OFFSPECReflRedOneAutoPolarizationCorrection.py 2 additions, 0 deletions...s/analysis/OFFSPECReflRedOneAutoPolarizationCorrection.py
- buildconfig/Jenkins/check_for_changes 12 additions, 11 deletionsbuildconfig/Jenkins/check_for_changes
- buildconfig/Jenkins/pylint-buildscript 88 additions, 0 deletionsbuildconfig/Jenkins/pylint-buildscript
- docs/source/algorithms/ComputeCalibrationCoefVan-v1.rst 1 addition, 1 deletiondocs/source/algorithms/ComputeCalibrationCoefVan-v1.rst
- docs/source/algorithms/CreateTransmissionWorkspace-v1.rst 2 additions, 0 deletionsdocs/source/algorithms/CreateTransmissionWorkspace-v1.rst
- docs/source/algorithms/CreateTransmissionWorkspaceAuto-v1.rst 3 additions, 3 deletions.../source/algorithms/CreateTransmissionWorkspaceAuto-v1.rst
Loading
Please register or sign in to comment