Skip to content
Snippets Groups Projects

2025-02-26: merge of 24.0 into main

Merged Walter Lampl requested to merge wlampl/athena:sweep_24.0_main_2025-02-26 into main

This sweep contains the following MRs:

Conflicts, resolved by hand:

  • InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py (InDetStandaloneTrackFitter, cc @tstreble)
  • Simulation/SimuJobTransforms/test/test_pileup.sh
Edited by Walter Lampl

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply
Loading