summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-help.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-01-01 03:14:01 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2016-12-31 19:42:26 -0800
commit5badc81c1cdfbb261ad3e6d1b753defb15712f26 (patch)
tree24d27c1855ccb9f14e0cfae7d0310f9597ae5f0f /lisp/vc/ediff-help.el
parente092f08515af5e523a85ce0624e36da61fba65bd (diff)
downloademacs-5badc81c1cdfbb261ad3e6d1b753defb15712f26.tar.gz
Update copyright year to 2017
Run admin/update-copyright.
Diffstat (limited to 'lisp/vc/ediff-help.el')
-rw-r--r--lisp/vc/ediff-help.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index 0f095a73388..3292b4d939d 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -1,6 +1,6 @@
;;; ediff-help.el --- Code related to the contents of Ediff help buffers
-;; Copyright (C) 1996-2016 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2017 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff