# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 971145177 0
# Node ID eaa80d9a03d4d5730dc5fd9436a3a8bd005e3eb0
# Parent  803ca8bc08b2d2168323ecad7232e81da4748615
Remove CVS merge cookie left in.

diff -r 803ca8bc08b2 -r eaa80d9a03d4 src/ChangeLog
--- a/src/ChangeLog	Tue Oct 10 02:00:52 2000 +0000
+++ b/src/ChangeLog	Tue Oct 10 02:32:57 2000 +0000
@@ -33,7 +33,6 @@
 	(syms_of_msdos): Don't intern and don't staticpro
 	Qbackground_color and Qforeground_color.
 
->>>>>>> 1.946
 2000-10-07  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* frame.c (Fframe_parameter): For non-windowed frames, if