Skip to content

2022-07-22/23/24: Daily merge of 22.0 into master

Walter Lampl requested to merge wlampl/athena:rel22ToMaster_Jul24 into master

Manually resolve conflicts in

  • MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/LayerAnalysis.h
  • InnerDetector/InDetConfig/python/TrackingCommonConfig.py

Merge request reports