Resolve CVS conflicts

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc05e47016a1a4ecf327a1f6450cfcef94dd2b74..cf554e9693fa8527ca98846afb1446e79c99ca58 100644 (file)
--- 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 9ea83c9f131fd83d9893f660f880d9a6ee4194ba..6aae7e44cdf7021302adcf38e3d8f6d3670281b3 100644 (file)
--- 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