Merge from origin/emacs-25

[gnu-emacs] / lisp / calendar / cal-french.el

diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index 36318702d067fbb373f90fcf833e298b1310b5c1..e808a4bdeb3c39adb2ecc8a10fc4adfe7e0f61c5 100644 (file)
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -1,7 +1,7 @@
 ;;; cal-french.el --- calendar functions for the French Revolutionary calendar
 
-;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2014
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2016 Free
+;; Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -256,8 +256,4 @@ Echo French Revolutionary date unless NOECHO is non-nil."
 
 (provide 'cal-french)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; cal-french.el ends here