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

diff --git a/common/clitkDicomRT_Contour.cxx b/common/clitkDicomRT_Contour.cxx
index f48ecde..9874563 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
-
   assert(at.GetNumberOfValues() == static_cast<unsigned int>(mNbOfPoints)*3);
 
   // Organize values