From: frog <frog>
Date: Tue, 30 Mar 2004 09:17:56 +0000 (+0000)
Subject:     Zilch.
X-Git-Tag: Version0.5.bp~262
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e25987c451d6f797a5e5288ac1a926cfd767fe57;p=gdcm.git

Zilch.
---

diff --git a/ChangeLog b/ChangeLog
index facb56e7..c2c89daf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,7 +80,6 @@
                        of gdcmDicomDirImage::NewImage as empty function.
 
 2004-02-28  Jean-Pierre Roux
-<<<<<<< ChangeLog
      * ENH add gdcmDicomDir:NewPatient
            add gdcmDicomDirPatient:NewStudy
            add gdcmDicomDirStudy:NewSerie