From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Thu, 28 Jul 2011 13:36:51 +0000 (+0200)
Subject: correct merge
X-Git-Tag: v1.3.0~249
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=204087abbc2842775d6df583e9588ee60aaf9bef;p=clitk.git

correct merge
---

diff --git a/common/clitkDicomRT_Contour.cxx b/common/clitkDicomRT_Contour.cxx
index f48ecde..74bafda 100644
--- a/common/clitkDicomRT_Contour.cxx
+++ b/common/clitkDicomRT_Contour.cxx
@@ -144,19 +144,7 @@ bool clitk::DicomRT_Contour::Read(gdcm::Item * item)
   const gdcm::DataElement & contourdata = nestedds2.GetDataElement( tcontourdata );
   at.SetFromDataElement( contourdata );
   const double* points = at.GetValues();
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< variant A
->>>>>>> variant B
-  //  unsigned int npts = at.GetNumberOfValues() / 3;
-======= end
-=======
-  //  unsigned int npts = at.GetNumberOfValues() / 3;
->>>>>>> Stashed changes
-=======
-  //  unsigned int npts = at.GetNumberOfValues() / 3;
->>>>>>> Stashed changes
-
+  unsigned int npts = at.GetNumberOfValues() / 3;
   assert(at.GetNumberOfValues() == static_cast<unsigned int>(mNbOfPoints)*3);
 
   // Organize values