mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-14 09:39:42 +00:00
Remove conflict marker.
This commit is contained in:
parent
6fcfeabfa1
commit
eafb38497e
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user