# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1065589843 0
# Node ID 8471c440544bce823ec11caeb0a89feb0df816b4
# Parent  bd3047570b728184fdc399e57bc1352c1072597a
Resolve CVS conflicts

diff -r bd3047570b72 -r 8471c440544b lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 08 03:16:58 2003 +0000
+++ b/lisp/ChangeLog	Wed Oct 08 05:10:43 2003 +0000
@@ -1900,4 +1900,4 @@
   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 -r bd3047570b72 -r 8471c440544b lisp/ChangeLog.10
--- a/lisp/ChangeLog.10	Wed Oct 08 03:16:58 2003 +0000
+++ b/lisp/ChangeLog.10	Wed Oct 08 05:10:43 2003 +0000
@@ -23539,3 +23539,5 @@
     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