From 114f9c96795aff3b51b9060d7c9c1b77debcc99a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 13 Jan 2010 00:35:10 -0800 Subject: Add 2010 to copyright years. --- lisp/smerge-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/smerge-mode.el') diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 95efbc513f0..732f7d19cf9 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1,7 +1,7 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -;; 2007, 2008, 2009 Free Software Foundation, Inc. +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: tools revision-control merge diff3 cvs conflict -- cgit v1.2.3