X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_Contour.cxx;fp=common%2FclitkDicomRT_Contour.cxx;h=f48ecded86853b8dc28fdfae8705baa34c2a3980;hb=af0902582360b7abaa82d2d1b7f37e837fe111da;hp=861717002ea65fa76b0a19ae12d62d19ea42500e;hpb=8f785a7646e65eb73b28e274871b2aafcb34d85c;p=clitk.git

diff --git a/common/clitkDicomRT_Contour.cxx b/common/clitkDicomRT_Contour.cxx
index 8617170..f48ecde 100644
--- a/common/clitkDicomRT_Contour.cxx
+++ b/common/clitkDicomRT_Contour.cxx
@@ -145,10 +145,14 @@ bool clitk::DicomRT_Contour::Read(gdcm::Item * item)
   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