From a0d62f5471f478ff6424629aeaf10ba42a7727d0 Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Mon, 27 Feb 2017 17:14:50 -0500
Subject: [PATCH] Resolve merging conflict

---
 SCRIPTS/SHMS/replay_shms.C | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SCRIPTS/SHMS/replay_shms.C b/SCRIPTS/SHMS/replay_shms.C
index 0c85d106..19a2e426 100644
--- a/SCRIPTS/SHMS/replay_shms.C
+++ b/SCRIPTS/SHMS/replay_shms.C
@@ -72,6 +72,7 @@ void replay_shms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   THaGoldenTrack* gtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
   gHaPhysics->Add(gtr);
 
+  // Add handler for prestart event 125.
   THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
   gHaEvtHandlers->Add(ev125);			     
   
-- 
GitLab