From 4b0292424554710c625369b3091a23e282e0e115 Mon Sep 17 00:00:00 2001
From: Philip Cook <cookpa@pennmedicine.upenn.edu>
Date: Thu, 28 Jul 2022 13:50:22 -0400
Subject: [PATCH] COMP: Remove conflict marker

---
 src/LabelFusion/WeightedVotingLabelFusionImageFilter.txx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/LabelFusion/WeightedVotingLabelFusionImageFilter.txx b/src/LabelFusion/WeightedVotingLabelFusionImageFilter.txx
index ed3781b..886ffe2 100644
--- a/src/LabelFusion/WeightedVotingLabelFusionImageFilter.txx
+++ b/src/LabelFusion/WeightedVotingLabelFusionImageFilter.txx
@@ -267,8 +267,7 @@ WeightedVotingLabelFusionImageFilter<TInputImage, TOutputImage>
     apd[i] = new InputImagePixelType[nPatch];
 
   // Also an array of pointers to the segmentations of different atlases
-  const InputImagePixelType **patchSeg = new const InputImagePixelType*[n]; 
->>>>>>> 515ff7c2f50928adabc4e64bded9a7e76fc750b1
+  const InputImagePixelType **patchSeg = new const InputImagePixelType*[n];
 
   // Create a counter map -- needed if we have weights or posteriors - so always
   m_CounterMap = PosteriorImage::New();