Skip to content

Daily merge of 23.0 into main

Edward Moyse requested to merge emoyse/athena:sweep_23.0_main_2023-07-19 into main

This sweep contains the following MRs:

I had two minor conflicts:

  • MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MuonAlignmentCondAlg.cxx - where I took !64434 (merged)
  • Tools/WorkflowTestRunner/python/References.py - where I kept what we had in main, since it was caused by !64405 (merged) which was a backport
Edited by Edward Moyse

Merge request reports