# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1026985376 0
# Node ID 272c43ada08769e63bd82f287831b82f3c7bb625
# Parent  22964382b73a9e1723c1a9d2c5048cbacaf3e5ad
Remove conflict marker.

diff -r 22964382b73a -r 272c43ada087 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jul 18 06:15:59 2002 +0000
+++ b/lisp/ChangeLog	Thu Jul 18 09:42:56 2002 +0000
@@ -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):