From fd43229afd8c80b4972b1f35f75be956aaef12ba Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 8 Oct 2003 05:10:43 +0000 Subject: [PATCH] Resolve CVS conflicts --- lisp/ChangeLog | 2 +- lisp/ChangeLog.10 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc05e47016a..cf554e9693f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1900,4 +1900,4 @@ See ChangeLog.10 for earlier changes. 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 +;;; arch-tag: e39939be-dab3-400e-86f5-0e2701a883c1 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 -- 2.39.2