Skip to content

Daily merge of 23.0 into master

Conflicts:

  • SiClusterizationTool/ClusterMakerTool. The conflict was caused by !62853 (merged) and !62051 (merged). It required manual resolution. @cvarni and @smh could you please check that everything is OK there.
  • ActsTrkClusterizationToolsConfig.py. The file has been deleted in the master and modified in the 23.0. So, I ignored the latter modifications. Hopefully, this was the right thing to do.

This sweep contains the following MRs:

Merge request reports

Loading