Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / common / clitkDicomRT_Contour.cxx

diff --git a/common/clitkDicomRT_Contour.cxx b/common/clitkDicomRT_Contour.cxx
index a4a69dd600df11350d337434e36937e0316d5895..987456392941e873f0e022e55553172acaa9ea5e 100644 (file)
--- a/common/clitkDicomRT_Contour.cxx
+++ b/common/clitkDicomRT_Contour.cxx
@@ -144,11 +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
-=======
   //  unsigned int npts = at.GetNumberOfValues() / 3;
->>>>>>> Stashed changes
-
   assert(at.GetNumberOfValues() == static_cast<unsigned int>(mNbOfPoints)*3);
 
   // Organize values