Add 2012 to FSF copyright years for Emacs files

[gnu-emacs] / lisp / vc / smerge-mode.el

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 64c4b04fb655c676c6250742ae4dd8019cd840d6..870246103a6e4d07c140047a4f0abc9590c65bc5 100644 (file)
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1,6 +1,6 @@
 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict