summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-help.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-01-01 00:21:42 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-01-01 00:57:59 -0800
commit5c7dd8a783fa2503f042f6671279e5fca38c35cb (patch)
tree5cdd7dbd45722f66524ec6956d90e99ae3ae4c34 /lisp/vc/ediff-help.el
parent220a9ecba1b62e09703cb0a3c122797d4498ccc2 (diff)
downloademacs-5c7dd8a783fa2503f042f6671279e5fca38c35cb.tar.gz
Update copyright year to 2018
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 3df0dc72547..0c8b840ad85 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-2017 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff