From fd0c71e869db245bf4304373b6dd5ec5160b8642 Mon Sep 17 00:00:00 2001
From: Deepak Goel <deego@gnufans.org>
Date: Thu, 6 Dec 2007 17:18:13 +0000
Subject: [PATCH] Resolve commit conflict.

---
 lisp/gnus/ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index bb92d478277..27b3a1586b7 100644
--- 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.
-- 
2.39.2