merge conflict

2 files changed, 6 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 50673dc7147..fe34433c391 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,4 +1,8 @@
-2010-01-19  Mark A. Hershberger  <mah@everybody.org>
+2010-01-24  Mark A. Hershberger  <mah@everybody.org>
+
+        * gnus.texi (Score File Format): Fix typo.
+
+2010-01-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * cc-mode.texi: Replace references to obsolete c-subword-mode.
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a33a91ba6f1..75720a94da1 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -21803,7 +21803,7 @@ not be loaded, even though they would normally be so, for some reason or
 other.
 
 @item eval
-The value of this entry will be @code{eval}el.  This element will be
+The value of this entry will be @code{eval}ed.  This element will be
 ignored when handling global score files.
 
 @item read-only