Remove spurious conflict indicators in ChangeLog

[gdcm.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 1e01dec732dcbb43e58aa88be154081eed325e78..4df8b67e596ba9304586745b30f921263fc90a80 100644 (file)
--- 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