From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48160/head -> cms-sw/refs/pull/48160/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 L1Trigger/L1TCommon/BuildFile.xml                  |  1 +
 L1Trigger/L1TCommon/src/XmlConfigParser.cc         |  7 ++++---
 L1Trigger/L1TMuonOverlap/BuildFile.xml             |  1 +
 .../L1TMuonOverlap/interface/XMLConfigWriter.h     |  2 ++
 L1Trigger/L1TMuonOverlap/src/XMLConfigReader.cc    | 23 ++++------------------
 L1Trigger/L1TMuonOverlap/src/XMLConfigWriter.cc    |  7 ++++++-
 L1Trigger/L1TMuonOverlapPhase1/BuildFile.xml       |  2 ++
 .../interface/Omtf/XMLConfigWriter.h               |  2 ++
 .../src/Omtf/XMLConfigReader.cc                    | 14 ++++---------
 .../src/Omtf/XMLConfigWriter.cc                    |  7 ++++++-
 10 files changed, 32 insertions(+), 34 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-05-23-1100'