# HG changeset patch
# User John Paul Wallington <jpw@pobox.com>
# Date 1097042681 0
# Node ID 32a9d7f91e8efc5bee02997c4da38ae1e2376972
# Parent  8e110e726b85ddaed4ad4351c64eb0f85c5bb79b
*** empty log message ***

diff -r 8e110e726b85 -r 32a9d7f91e8e lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 06 06:03:54 2004 +0000
+++ b/lisp/ChangeLog	Wed Oct 06 06:04:41 2004 +0000
@@ -1,3 +1,7 @@
+2004-10-06  John Paul Wallington  <jpw@gnu.org>
+
+	* xml.el (xml-parse-dtd): Fix `error' call.
+
 2004-10-05  Mark A. Hershberger  <mah@everybody.org>
 
 	* xml.el (xml-substitute-special): Return a single string instead
@@ -17,7 +21,6 @@
 	(Info-build-toc): Don't check for special Info file names.
 	Set main-file to nil if Info-find-file returns a symbol.
 
->>>>>>> 1.6421
 2004-10-05  Emilio C. Lopes  <eclig@gmx.net>:
 
 	* calendar/calendar.el (calendar-goto-iso-week): Add autoload.