From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47380/head -> cms-sw/refs/pull/47380/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Configuration/Geometry/python/GeometryIdeal2015_cff.py      | 4 +++-
 Configuration/Geometry/python/GeometryIdeal2015dev_cff.py   | 4 +++-
 Configuration/Geometry/python/GeometryIdealAPD1_cff.py      | 4 +++-
 Configuration/Geometry/python/GeometryIdealNoAPD_cff.py     | 4 +++-
 Configuration/Geometry/python/GeometryIdeal_cff.py          | 4 +++-
 Configuration/Geometry/python/GeometryNoCastor_cff.py       | 6 +++++-
 Configuration/Geometry/python/GeometrySLHCReco_cff.py       | 7 ++++++-
 Configuration/Geometry/python/GeometrySLHCSimIdeal_cff.py   | 2 +-
 Configuration/Geometry/python/GeometrySimAll_cff.py         | 4 +++-
 Configuration/Geometry/python/GeometrySimIdealGFlash_cff.py | 4 +++-
 Configuration/Geometry/python/GeometrySimIdeal_cff.py       | 4 +++-
 Configuration/Geometry/python/GeometrySimTracker_cff.py     | 2 +-
 12 files changed, 37 insertions(+), 12 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-02-17-1100'