From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47683/head -> cms-sw/refs/pull/47683/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 EventFilter/L1GlobalTriggerRawToDigi/src/L1GTDigiToRaw.cc |  3 +--
 EventFilter/L1TXRawToDigi/plugins/L1TTwinMuxRawToDigi.cc  |  2 +-
 L1Trigger/CSCTrackFinder/src/CSCTFPtLUT.cc                |  2 --
 L1Trigger/DTBti/src/DTBtiCard.cc                          |  4 ----
 L1Trigger/DTBti/src/DTBtiChipEquations.cc                 |  4 +---
 L1Trigger/GlobalTrigger/src/L1GlobalTriggerPSB.cc         |  6 ------
 L1Trigger/GlobalTrigger/src/L1GtCorrelationCondition.cc   |  1 -
 L1Trigger/HardwareValidation/src/L1Comparator.cc          | 13 ++++---------
 L1Trigger/L1CaloTrigger/plugins/L1NNCaloTauEmulator.cc    |  2 +-
 9 files changed, 8 insertions(+), 29 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-03-25-2300'