From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47498/head -> cms-sw/refs/pull/47498/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 CalibCalorimetry/CastorCalib/src/CastorDbHardcode.cc                | 1 -
 CalibCalorimetry/CastorCalib/src/CastorPedestalAnalysis.cc          | 1 -
 CalibCalorimetry/EcalLaserAnalyzer/src/MELaserPrim.cc               | 2 --
 CalibFormats/SiPixelObjects/src/PixelFEDCard.cc                     | 1 -
 .../plugins/SiPixelGainCalibrationAnalysis.cc                       | 6 ++----
 CalibTracker/SiStripAPVAnalysis/src/TT6ApvMask.cc                   | 2 --
 CondCore/Utilities/src/CondDBImport.cc                              | 1 -
 CondFormats/DTObjects/src/DTReadOutMapping.cc                       | 1 -
 CondFormats/L1TObjects/src/L1GtTriggerMenu.cc                       | 1 -
 CondTools/DT/src/DTExpandMap.cc                                     | 1 -
 CondTools/DT/src/DTHVStatusHandler.cc                               | 1 -
 11 files changed, 2 insertions(+), 16 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-03-03-2300'