Update copyright year to 2014 by running admin/update-copyright.

[gnu-emacs] / lisp / vc / ediff-merg.el

diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index a319d8de9b69b4a7df21e86bba61925eb09c273a..0f7d0628a1d0a3ab095cc8b0699fa59f99935db3 100644 (file)
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -1,6 +1,6 @@
 ;;; ediff-merg.el --- merging utilities
 
-;; Copyright (C) 1994-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff