diff options
| author | Elena Zannoni <ezannoni@kwikemart.cygnus.com> | 2001-02-20 00:12:40 +0000 |
|---|---|---|
| committer | Elena Zannoni <ezannoni@kwikemart.cygnus.com> | 2001-02-20 00:12:40 +0000 |
| commit | f07e76c6c1631886bdfe4a0849d0cf38e05a9060 (patch) | |
| tree | 9b4b1ea52570ef9c85de0d9f6e8c3176f812c451 /gdb | |
| parent | a858089e450ff6ad19e0991da0b09b1192e869ad (diff) | |
| download | gdb-f07e76c6c1631886bdfe4a0849d0cf38e05a9060.zip gdb-f07e76c6c1631886bdfe4a0849d0cf38e05a9060.tar.gz gdb-f07e76c6c1631886bdfe4a0849d0cf38e05a9060.tar.bz2 | |
Remove cvs conflict indicator.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1ce5b14..e03b625 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. |