Skip to content
Snippets Groups Projects
Select Git revision
  • main default
  • codespell_docs_algorithms
  • move_spin_validator
  • hb2a_merge_fix
  • 38143_outofbounds_error_shoeboxtof
  • add-gauge-vol-to-monte-carlo
  • 38311-plot-marker-labels-in-the-wrong-place-when-using-log-scale
  • 37579_fix_hidden_button
  • update-rasterize-ornl-next
  • EWM10069-Update_BeamProfileFactory
  • 39120-ornl-next
  • 39062-ornl-next
  • helpwindow-docs-ui-indicator
  • getting_started_mantid_developer_update_info
  • update-snap-idf
  • 38301-unpin-mkl
  • 39088_short_form_spacegroups
  • pin-pydantic-in-mantid-recipe
  • ewm9984-deprecate-UnwrapMonitorsInTOF
  • pin_libexpat
  • v6.12.20250402.2323
  • v6.12.20250401.2327
  • v6.12.20250324.1657
  • v6.12.0.1
  • v6.12.20250321.0927
  • v6.12.20250320.1713
  • v6.12.0.1rc3
  • v6.12.20250314.1925
  • v6.12.0.1rc2
  • v6.12.20250313.1634
  • v6.12.20250312.2000
  • v6.12.0.1rc1
  • v6.12.20250310.1545
  • v6.12.20250306.2035
  • v6.12.20250304.2007
  • v6.12.20250303.2021
  • v6.12.20250228.2045
  • v6.11.0.5
  • v6.12.0
  • v6.11.0.5rc1
40 results
Blame Permalink
  • Savici, Andrei T.'s avatar
    aa200bf0
    Fix conflicts. Refs #11134 · aa200bf0
    Savici, Andrei T. authored 
    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
    aa200bf0
    History
    Fix conflicts. Refs #11134
    Savici, Andrei T. authored 
    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
Code owners
Assign users and groups as approvers for specific file changes. Learn more.