]> code.delx.au - gnu-emacs/blobdiff - lisp/vc/ediff-merg.el
Update copyright year to 2015
[gnu-emacs] / lisp / vc / ediff-merg.el
index a319d8de9b69b4a7df21e86bba61925eb09c273a..72dfc0861f5b306478f074b84a03e45c8d2fb2ee 100644 (file)
@@ -1,6 +1,6 @@
 ;;; ediff-merg.el --- merging utilities
 
-;; Copyright (C) 1994-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2015 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff