diff options
| author | Stefan Monnier <[email protected]> | 2006-04-30 15:49:08 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2006-04-30 15:49:08 +0000 |
| commit | cc1eecfd888839f6d75c0c7aa5d1e8e37f31d1c7 (patch) | |
| tree | 36ddec2a81e2feb6fcea34bf04b79b770b23e20f /lisp/smerge-mode.el | |
| parent | 39c41ad4211ebf2ce76fc49d9621adace0439399 (diff) | |
Update my email address.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 9fddc4b1a0..8d9df18887 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. -;; Author: Stefan Monnier <[email protected]> +;; Author: Stefan Monnier <[email protected]> ;; Keywords: tools revision-control merge diff3 cvs conflict ;; This file is part of GNU Emacs. |