* vc/vc.el (vc-merge): Fix a prompt.

[gnu-emacs] / lisp / paths.el

diff --git a/lisp/paths.el b/lisp/paths.el
index b7d476a763438d227ac4110dc09997a184b0d3bc..70b5ca5dbfb03a80f45754f73ff33726d1d93c6e 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -1,7 +1,6 @@
 ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1988, 1994, 1999-2012  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal