Resolve conflict.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fe0e57..2d9da87 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,11 @@
        * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify
        documentation.
 
+2011-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-uu.el (gnus-uu-grab-articles): Require gnus-async so that
+       `gnus-asynchronous' isn't shadowed.
+
 2011-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-xmas.el (gnus-xmas-define): Add `member-ignore-case'.