Remove CVS-merge trash from ChangeLog.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1f25aa032d6619bc51035aca001d0293e81177e5..a9f10f107f264f78058ac8954036b6006ad412ed 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -53,7 +53,6 @@ Sat May  8 01:39:30 1993  (pes@regent.e-technik.tu-muenchen.de)
        * coffread.c (read_coff_symtab): Don't fclose stream as it is no
        longer opened twice.
 
->>>>>>> 1.1257
 Thu May  6 21:08:55 1993  Jim Kingdon  (kingdon@cygnus.com)
 
        * solib.c (clear_solib): Don't close bfd if it is NULL.