merge conflict

[gnu-emacs] / lisp / mail / mspools.el

diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index 5c5c86fbc2e97c078f5e15d7dfc9fe5c9d5c8f9a..705c06977bbba093d4a693446853b4f10ffc18d0 100644 (file)
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -1,7 +1,7 @@
 ;;; mspools.el --- show mail spools waiting to be read
 
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>