From: jpr <jpr>
Date: Tue, 27 Jan 2004 09:44:48 +0000 (+0000)
Subject: Remove spurious conflict indicators in ChangeLog
X-Git-Tag: Version0.4~55
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=764f1d6d9f268db098e5dd0cb8be7dabcd8f3d9f;p=gdcm.git

Remove spurious conflict indicators in ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index 1e01dec7..4df8b67e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,7 +28,6 @@
      * Split the IsReadable method between gdcmParser which test that the file
        is dicom and gdcmHeader which test that it's an image file
 
->>>>>>> 1.146
 2004-01-22 Benoit Regrain
      * DicomDir : clean code, add methods, set variables in protected or private
      * gdcmUtil : bug fix for the clean string method