clean up cvs merge conflict flags.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e7d73252bc126e8fb142d6cc0efd1bc3eaae30f9..e488e313db265bf22f4a5434ffead1e2c1cdda6a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -67,7 +67,6 @@ Wed Apr 24 14:22:21 2002  Andrew Cagney  <cagney@redhat.com>
        REGISTER_RAW_SIZE of SP_REGNUM not CORE_ADDR.
        (vx_write_register): Likewise.
 
->>>>>>> 1.2500
 2002-04-23  J. Brobecker  <brobecker@gnat.com>
 
        * source.c (is_regular_file): New function.