Skip to content

2022-07-12: Daily merge of 22.0 into master

Tadej Novak requested to merge tadej/athena:sweep-2022-07-12 into master

Merging nightly/22.0/2022-07-11T2101 into master.

Conflicts (all kept master):

  • Control/StoreGate/StoreGate/WriteCondHandle.h
  • InnerDetector/InDetDigitization/PixelDigitization/src/BichselData.cxx
  • MuonSpectrometer/MuonGeoModel/src/MuonDetectorCondAlg.cxx
  • Tools/WorkflowTestRunner/python/References.py

/cc @jojungge @ssnyder

Merge request reports

Loading