Remove cvs conflict indicator.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ce5b147611c82d3cc8ca3bbf4c30ca5d3aa92a3..e03b625d06beb312b56437b2952c243d7ea83694 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.