Remove conflict marker.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50f31ed41d0734a292f60202851ea17a67a752d1..0e59d51062a40786b3852b76953a35fba0d3c74e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -83,7 +83,6 @@
        * international/utf-8-subst.el: Populate utf-8-subst-rev-table.
        (utf-8-subst-table): Don't set.
 
->>>>>>> 1.4125
 2002-07-17  Kenichi Handa  <handa@etl.go.jp>
 
        * international/mule.el (define-coding-system-alias):