Mercurial > emacs
diff lisp/gnus/nnml.el @ 108947:ca556d6b7c7a
Conflict resolution fixup
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 855f55740303 |
children | d6a756a04dd0 376148b31b5e |
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 855f55740303 |
children | d6a756a04dd0 376148b31b5e |