Mercurial > emacs
diff lisp/gnus/gnus-agent.el @ 108947:ca556d6b7c7a
Conflict resolution fixup
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 68c7ddc1af16 |
children | 8d09094063d0 |
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 68c7ddc1af16 |
children | 8d09094063d0 |