Resolve commit conflict.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index bb92d478277d2b83b26ec0a745aeb5f790cd32f2..27b3a1586b79250fb02e7d0d4b4fb4956b6d7df7 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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.