X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=ChangeLog;h=c2c89dafcee7cdd11592396720012e59fa38f478;hb=e25987c451d6f797a5e5288ac1a926cfd767fe57;hp=facb56e755be7a27eed2dede8dc5516d514eeb98;hpb=4f48626ba6d2dc26d40f07b780b0fdb5fcc04911;p=gdcm.git

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