Mercurial > emacs
changeset 46515:272c43ada087
Remove conflict marker.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Thu, 18 Jul 2002 09:42:56 +0000 |
| parents | 22964382b73a |
| children | 25e7debccc64 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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):