summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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):