Remove conflict text

HEP-FCC · Aug 6, 2024 · 1e0bcb7 · 1e0bcb7
1 parent 351998b
commit 1e0bcb7
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/RecFCCeeCalorimeter/src/components/CaloTowerToolFCCee.h b/RecFCCeeCalorimeter/src/components/CaloTowerToolFCCee.h
@@ -182,17 +182,6 @@ class CaloTowerToolFCCee : public AlgTool, virtual public ITowerToolThetaModule
   SegmentationType m_hcalFwdSegmentationType;
   /// decoder: only for barrel
   dd4hep::DDSegmentation::BitFieldCoder* m_decoder;
-<<<<<<< HEAD
-=======
-  // Set of bools to record whether a proper segmentation was found
-  bool m_ecalBarrelSegmentationOK;
-  bool m_ecalEndcapSegmentationOK;
-  bool m_ecalFwdSegmentationOK;
-  bool m_hcalBarrelSegmentationOK;
-  bool m_hcalExtBarrelSegmentationOK;
-  bool m_hcalEndcapSegmentationOK;
-  bool m_hcalFwdSegmentationOK;
->>>>>>> 0bdbac8 (Remove segmentation members)
 
   /// Maximum theta of detector
   float m_thetaMax;