From fa065778e21953362390c329dc65aa9a36a45cd7 Mon Sep 17 00:00:00 2001
From: David Emschermann <d.emschermann@gsi.de>
Date: Tue, 26 Mar 2024 14:56:26 +0100
Subject: [PATCH] Fix mcbm_transport.C parameters again
---
macro/mcbm/mcbm_transport.C | 4 ----
1 file changed, 4 deletions(-)
diff --git a/macro/mcbm/mcbm_transport.C b/macro/mcbm/mcbm_transport.C
index 43dd7b776d..3176de3426 100644
--- a/macro/mcbm/mcbm_transport.C
+++ b/macro/mcbm/mcbm_transport.C
@@ -30,10 +30,6 @@ void mcbm_transport(Int_t nEvents = 10,
// const char* setupName = "mcbm_beam_2022_02",
// const char* setupName = "mcbm_beam_2022_01",
const char* setupName = "mcbm_beam_2024_03_22_gold",
-<<<<<<< HEAD
- // const char* setupName = "mcbm_beam_2023_00_much_out_sts_downstream",
-=======
->>>>>>> 7db1a6be4 (Fix mcbm_transport.C parameters)
// const char* setupName = "mcbm_beam_2022_06_16_gold",
// const char* setupName = "mcbm_beam_2022_05_23_nickel",
// const char* setupName = "mcbm_beam_2022_03_28_uranium",
--
GitLab