Remove CVS merge cookie left in.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5dc70468f4d9e88c3bf5e224d88c8c1a76d86d4a..c8ba96834d39169b0b21e6bc293c7376e8a87218 100644 (file)
--- 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