diff options
author | Miles Bader <miles@gnu.org> | 2003-10-08 05:10:43 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2003-10-08 05:10:43 +0000 |
commit | fd43229afd8c80b4972b1f35f75be956aaef12ba (patch) | |
tree | 5c4318e0b6f77768b64fcd947e0282bbcceea79b /lisp/ChangeLog.10 | |
parent | 8c7e427d571158908ffd6b3d1955aa378f924445 (diff) | |
download | emacs-fd43229afd8c80b4972b1f35f75be956aaef12ba.tar.gz |
Resolve CVS conflicts
Diffstat (limited to 'lisp/ChangeLog.10')
-rw-r--r-- | lisp/ChangeLog.10 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 9ea83c9f131..6aae7e44cdf 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -23539,3 +23539,5 @@ See ChangeLog.9 for earlier changes. Copyright (C) 2001, 2002 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. + +;;; arch-tag: 5fcf8004-6f58-452a-b9d6-6950323a19c1 |