From ecfb02e911942c75a005d41b7b63973f8ac6bbda Mon Sep 17 00:00:00 2001
From: myliu <201916234@mail.sdu.edu.cn>
Date: Thu, 21 Jan 2021 21:42:13 +0800
Subject: [PATCH] Delete redundant sentences
---
Digitisers/DCHDigi/src/DCHDigiAlg.cpp | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp b/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
index 25b748d2..0b9f8f0f 100644
--- a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
+++ b/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
@@ -108,11 +108,8 @@ StatusCode DCHDigiAlg::execute()
id_hits_map[id] = vhit ;
}
}
-<<<<<<< HEAD
if(m_WriteAna && (nullptr!=m_tuple)){
-=======
if(m_WriteAna){
->>>>>>> f65db69923e45779cd7bd84de28520c5b26a4b4a
m_n_sim = 0;
m_n_digi = 0 ;
}
--
GitLab