diff options
author | Glenn Morris <[email protected]> | 2008-05-11 19:00:41 +0000 |
---|---|---|
committer | Glenn Morris <[email protected]> | 2008-05-11 19:00:41 +0000 |
commit | 869522fb01f5e5b9221741b53b12f92057314a64 (patch) | |
tree | 371e5a5f19e073971ee8a19c9c0e0682810572e4 /lisp/smerge-mode.el | |
parent | 2e4f4469220b84c52d76c86077d1f7c9ddf4a4c5 (diff) |
Re-fill copyright years.
Re-fix permissions notice.
Diffstat (limited to 'lisp/smerge-mode.el')
-rw-r--r-- | lisp/smerge-mode.el | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index fb13d2f3f7..7efe1e6ff0 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1,17 +1,17 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008 Free Software Foundation, Inc. ;; Author: Stefan Monnier <[email protected]> ;; Keywords: tools revision-control merge diff3 cvs conflict ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,9 +19,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: |