From 11832e60a3c7c3b4798df6139e8f24f16267031a Mon Sep 17 00:00:00 2001
From: Michael Snyder <msnyder@vmware.com>
Date: Wed, 24 Apr 2002 21:22:36 +0000
Subject: [PATCH] clean up cvs merge conflict flags.

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e7d73252bc1..e488e313db2 100644
--- 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.
-- 
2.30.2