From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48033/head -> cms-sw/refs/pull/48033/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 PhysicsTools/BPHNano/plugins/BToTrkTrkLLBuilder.cc |  10 +-
 PhysicsTools/BPHNano/plugins/DiLeptonBuilder.cc    |  13 +-
 PhysicsTools/BPHNano/python/BToKLL_cff.py          |  86 +++++------
 PhysicsTools/BPHNano/python/BToTrkTrkLL_cff.py     | 163 +++++++++++++--------
 PhysicsTools/BPHNano/python/BToV0LL_cff.py         | 128 ++++++++--------
 PhysicsTools/BPHNano/python/DiTrack_cff.py         |  38 -----
 PhysicsTools/BPHNano/python/MuMu_cff.py            |  18 ++-
 PhysicsTools/BPHNano/python/V0_cff.py              |  46 +++---
 PhysicsTools/BPHNano/python/genparticlesBPH_cff.py |   6 +-
 PhysicsTools/BPHNano/python/muons_cff.py           |  24 +--
 PhysicsTools/BPHNano/python/tracks_cff.py          |  26 ++--
 PhysicsTools/BPHNano/python/vertices_cff.py        |  12 +-
 PhysicsTools/NanoAOD/python/custom_bph_cff.py      |   6 +-
 13 files changed, 299 insertions(+), 277 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-05-08-1100'