Remove merge mark and clean up one additional line introduced...

cms-sw · Aug 12, 2024 · ad4143d · ad4143d
1 parent bfb8f6c
commit ad4143d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Configuration/StandardSequences/python/Mixing.py b/Configuration/StandardSequences/python/Mixing.py
@@ -128,11 +128,7 @@ def addMixingScenario(label,dict):
 addMixingScenario("2023_25ns_EraC_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_2023_25ns_EraC_PoissonOOTPU_cfi'})
 addMixingScenario("2023_25ns_EraD_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_2023_25ns_EraD_PoissonOOTPU_cfi'})
 addMixingScenario("2023_25ns_EraCD_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_2023_25ns_EraCD_PoissonOOTPU_cfi'})
-<<<<<<< HEAD
-=======
-addMixingScenario("2023_25ns_RunIII2023Summer24_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_2023_25ns_RunIII2023Summer24_PoissonOOTPU_cfi'})
 addMixingScenario("2024_25ns_RunIII2024Summer24_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_2024_25ns_RunIII2024Summer24_PoissonOOTPU_cfi'})
->>>>>>> 62cadd80232 (Merge pull request #45474 from CMS-LUMI-POG/master)
 addMixingScenario("ProdStep2",{'file': 'SimGeneral.MixingModule.mixProdStep2_cfi'})
 addMixingScenario("fromDB",{'file': 'SimGeneral.MixingModule.mix_fromDB_cfi'})
 addMixingScenario("2022_LHC_Simulation_10h_2h",{'file': 'SimGeneral.MixingModule.Run3_2022_LHC_Simulation_10h_2h_cfi'})