From: Andreas Schwab <schwab@suse.de>
Date: Thu, 18 Jul 2002 09:42:56 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: ttn-vms-21-2-B4~14008
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eafb38497ed0e54863290a70abb80f6941efaf43;p=emacs.git

Remove conflict marker.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50f31ed41d0..0e59d51062a 100644
--- 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):