From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47371/head -> cms-sw/refs/pull/47371/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Configuration/Geometry/python/GeometryExtended2016_cff.py            | 4 +++-
 Configuration/Geometry/python/GeometryExtended2016dev_cff.py         | 4 +++-
 .../python/GeometryExtended2017Plan1FlatMinus05Percent_cff.py        | 4 +++-
 .../python/GeometryExtended2017Plan1FlatMinus10Percent_cff.py        | 4 +++-
 .../python/GeometryExtended2017Plan1FlatPlus05Percent_cff.py         | 5 +++--
 .../python/GeometryExtended2017Plan1FlatPlus10Percent_cff.py         | 4 +++-
 .../Geometry/python/GeometryExtended2017Plan1ZeroMaterial_cff.py     | 4 +++-
 Configuration/Geometry/python/GeometryExtended2017Plan1_cff.py       | 5 +++--
 Configuration/Geometry/python/GeometryExtended2017_cff.py            | 4 +++-
 .../Geometry/python/GeometryExtended2018FlatMinus05Percent_cff.py    | 4 +++-
 .../Geometry/python/GeometryExtended2018FlatMinus10Percent_cff.py    | 4 +++-
 .../Geometry/python/GeometryExtended2018FlatPlus05Percent_cff.py     | 4 +++-
 .../Geometry/python/GeometryExtended2018FlatPlus10Percent_cff.py     | 4 +++-
 .../Geometry/python/GeometryExtended2018ZeroMaterial_cff.py          | 4 +++-
 Configuration/Geometry/python/GeometryExtended2018_cff.py            | 5 +++--
 15 files changed, 45 insertions(+), 18 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-02-17-1100'