2023-11-03: merge of 23.0 into main (!66895) · Merge requests · atlas / athena · GitLab

Johannes Elmsheuser requested to merge elmsheus/athena:sweep_23.0_main_2023-11-03 into main Nov 03, 2023

Resolve conflict in CMakeLists.txt and move nlohmann_json dependency to private for !66844 (merged) as follow-up to !66676 (merged) and !66865 (merged)

This sweep contains the following MRs:

!66843 (merged) Manual pick of 66719 for 23.0 Core
!66840 (merged) Merge branch 'kk_CA_SCTExtensionAlg' into 'main' InnerDetector
!66844 (merged) changes to set up ROOT dictionary for ZdcAnalysis in AthAnalysis ForwardDetectors

Edited Nov 03, 2023 by Johannes Elmsheuser