diff options
| author | Erik Naggum <erik@naggum.no> | 1996-01-14 07:34:30 +0000 |
|---|---|---|
| committer | Erik Naggum <erik@naggum.no> | 1996-01-14 07:34:30 +0000 |
| commit | b578f267af27af50e3c091f8c9c9eee939b69978 (patch) | |
| tree | c41e03d173274cfc11edf51a3fc63cd51060e59d /lisp/ediff-merg.el | |
| parent | 8f652877984d1fde4ec6b98e4315dfb36408b548 (diff) | |
| download | emacs-b578f267af27af50e3c091f8c9c9eee939b69978.tar.gz | |
Update FSF's address.
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 9b473816d37..eb203df6307 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -1,5 +1,6 @@ ;;; ediff-merg.el --- merging utilities -;;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. + +;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.sunysb.edu> @@ -16,9 +17,11 @@ ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA. +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. +;;; Code: (require 'ediff-init) |