From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Thu, 28 Jul 2011 10:59:47 +0000 (+0200)
Subject: first trial
X-Git-Tag: v1.3.0~250
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=af0902582360b7abaa82d2d1b7f37e837fe111da;p=clitk.git

first trial
---

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