merge conflict

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

diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index 940ffadc495b7b4b55c5e349db01bc7ad94f65ba..4520ea61d03f6e11716ca0ec223563ec9d360ca5 100644 (file)
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -1,7 +1,7 @@
 ;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal