From f07e76c6c1631886bdfe4a0849d0cf38e05a9060 Mon Sep 17 00:00:00 2001
From: Elena Zannoni <ezannoni@kwikemart.cygnus.com>
Date: Tue, 20 Feb 2001 00:12:40 +0000
Subject: [PATCH] Remove cvs conflict indicator.

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ce5b14761..e03b625d06 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -126,7 +126,6 @@
 	* f-exp.y: Include <ctype.h>.
 	(parse_number): Ensure that ``i'' is always initialized.
 
->>>>>>> 1.966
 2001-02-14  Jim Kingdon  <jkingdon@engr.sgi.com>
 
 	* MAINTAINERS: Add myself to paper trail section.