Fix merge from Emacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 222825c..387a9b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,14 +1,10 @@
-<<<<<<< TREE
-2008-01-24    Michael Sperber  <sperber@deinprogramm.de>
+2008-01-28  Dan Nicolaescu  <dann@ics.uci.edu>
 
-       * mail-source.el (mail-sources): Add `group' choice.
-
-       * nnmail.el (nnmail-get-new-mail-1): Abstract this out to add another
-       parameter `in-group' to control into which group the articles go.
-       Add treatment of `group' mail-source.
+       * sieve.el (sieve-make-overlay, sieve-overlay-put, sieve-overlays-at):
+       * message.el (message-beginning-of-line): Use featurep instead of bound
+       tests in order to resolve conditionals at compile time.
 
-=======
-2008-01-24    Michael Sperber  <sperber@deinprogramm.de>
+2008-01-24  Michael Sperber  <sperber@deinprogramm.de>
 
        * mail-source.el (mail-sources): Add `group' choice.
 
@@ -16,13 +12,6 @@
        parameter `in-group' to control into which group the articles go.
        Add treatment of `group' mail-source.
 
-2008-01-24  Dan Nicolaescu  <dann@ics.uci.edu>
-
-       * sieve.el (sieve-make-overlay, sieve-overlay-put, sieve-overlays-at):
-       * message.el (message-beginning-of-line): Use featurep instead of bound
-       tests in order to resolve conditionals at compile time.
-
->>>>>>> MERGE-SOURCE
 2008-01-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-insert-mime-button): Don't decode description.