From 10e5ab47673405960c83a866d96fcecbc4522a8b Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@gnu.org>
Date: Tue, 10 Oct 2000 02:32:57 +0000
Subject: [PATCH] Remove CVS merge cookie left in.

---
 src/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 5dc70468f4d..c8ba96834d3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
-- 
2.39.2