# HG changeset patch
# User Deepak Goel <deego@gnufans.org>
# Date 1196961493 0
# Node ID 04590cd6c71c18f54e95a42c1f95d6cfc82f16b6
# Parent  23c6fc4561eaa6e56b3e8e3b32283133eb5e8ecd
Resolve commit conflict.

diff -r 23c6fc4561ea -r 04590cd6c71c lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Thu Dec 06 16:30:37 2007 +0000
+++ b/lisp/gnus/ChangeLog	Thu Dec 06 17:18:13 2007 +0000
@@ -1,3 +1,9 @@
+2007-12-06  D. Goel  <deego3@gmail.com>
+
+
+	* gnus-art.el (article-make-date-line): Fix buggy call to `error'.
+	* gnus-start.el (gnus-load): Ditto.
+
 2007-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (gnus-use-idna)
@@ -57,6 +63,7 @@
 	(rfc2047-encoded-word-regexp-loose): Move forward; add comments
 	explaining what regexp patterns are for.
 
+>>>>>>> 1.607
 2007-12-04  Glenn Morris  <rgm@gnu.org>
 
 	* password.el: Move to ../password-cache.el.