diff options
| author | Andreas Schwab | 2002-07-18 09:42:56 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2002-07-18 09:42:56 +0000 |
| commit | eafb38497ed0e54863290a70abb80f6941efaf43 (patch) | |
| tree | 013332c3e74feb964592ca14dfd58bf8b15741f2 | |
| parent | 6fcfeabfa14298567aca10e1e4b84900ee776093 (diff) | |
| download | emacs-eafb38497ed0e54863290a70abb80f6941efaf43.tar.gz emacs-eafb38497ed0e54863290a70abb80f6941efaf43.zip | |
Remove conflict marker.
| -rw-r--r-- | lisp/ChangeLog | 1 |
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 @@ | |||
| 83 | * international/utf-8-subst.el: Populate utf-8-subst-rev-table. | 83 | * international/utf-8-subst.el: Populate utf-8-subst-rev-table. |
| 84 | (utf-8-subst-table): Don't set. | 84 | (utf-8-subst-table): Don't set. |
| 85 | 85 | ||
| 86 | >>>>>>> 1.4125 | ||
| 87 | 2002-07-17 Kenichi Handa <handa@etl.go.jp> | 86 | 2002-07-17 Kenichi Handa <handa@etl.go.jp> |
| 88 | 87 | ||
| 89 | * international/mule.el (define-coding-system-alias): | 88 | * international/mule.el (define-coding-system-alias): |