correct merge

diff --git a/common/clitkDicomRT_Contour.cxx b/common/clitkDicomRT_Contour.cxx
index f48ecded86853b8dc28fdfae8705baa34c2a3980..74bafda94bdcda0157ed76b1c59ff8d683fc736e 100644 (file)
--- 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