Remove cvs conflict indicator.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ce5b14..e03b625 100644 (file)
--- 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.