From 25f5365324c78b7c4afcf14a4bfdbd80b34a076d Mon Sep 17 00:00:00 2001
From: "s.zharko@gsi.de" <s.zharko@gsi.de>
Date: Wed, 28 Jun 2023 14:23:45 +0200
Subject: [PATCH] CA: Bugfix in ideal hit finder

---
 reco/L1/utils/CbmCaIdealHitProducerDet.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/reco/L1/utils/CbmCaIdealHitProducerDet.h b/reco/L1/utils/CbmCaIdealHitProducerDet.h
index 2e6631c4ad..cd40487f4f 100644
--- a/reco/L1/utils/CbmCaIdealHitProducerDet.h
+++ b/reco/L1/utils/CbmCaIdealHitProducerDet.h
@@ -36,7 +36,10 @@
 #include "CbmTrdPoint.h"
 #include "CbmTrdTrackingInterface.h"
 
+<<<<<<< HEAD
 #include "FairRootManager.h"
+=======
+>>>>>>> CA: Bugfix in ideal hit finder
 #include "FairTask.h"
 #include "Logger.h"
 
-- 
GitLab