Zilch.

[gdcm.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index facb56e755be7a27eed2dede8dc5516d514eeb98..c2c89dafcee7cdd11592396720012e59fa38f478 100644 (file)
--- 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