Skip to content
Snippets Groups Projects
Commit aa200bf0 authored by Savici, Andrei T.'s avatar Savici, Andrei T.
Browse files

Fix conflicts. Refs #11134 

Merge remote-tracking branch 'origin/master' into 11134_reducePylintWarnings

Conflicts:
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/SortDetectors.py
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/SortXAxis.py
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/Symmetrise.py
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/VesuvioResolution.py
	Code/Mantid/scripts/Inelastic/IndirectAbsCor.py
	Code/Mantid/scripts/Inelastic/IndirectBayes.py
	Code/Mantid/scripts/Inelastic/IndirectCommon.py
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
	Code/Mantid/scripts/Inelastic/IndirectNeutron.py
parents 768f9492 b4c62ec1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 446 additions and 102 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