projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a858089)
Remove cvs conflict indicator.
authorElena Zannoni <ezannoni@kwikemart.cygnus.com>
Tue, 20 Feb 2001 00:12:40 +0000 (00:12 +0000)
committerElena Zannoni <ezannoni@kwikemart.cygnus.com>
Tue, 20 Feb 2001 00:12:40 +0000 (00:12 +0000)
gdb/ChangeLog patch | blob | history

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.