diff options
| author | Christopher Faylor <me+cygwin@cgf.cx> | 2003-01-30 01:42:01 +0000 |
|---|---|---|
| committer | Christopher Faylor <me+cygwin@cgf.cx> | 2003-01-30 01:42:01 +0000 |
| commit | c4c31f17e89fa407e9477e00bd4a6f3d7e034f4d (patch) | |
| tree | f028d3de528e2df5fa15ef88e464ca74240c4d95 | |
| parent | baa93fa6f9249a1edc8c0fc10d8425ea964cb795 (diff) | |
| download | gdb-c4c31f17e89fa407e9477e00bd4a6f3d7e034f4d.zip gdb-c4c31f17e89fa407e9477e00bd4a6f3d7e034f4d.tar.gz gdb-c4c31f17e89fa407e9477e00bd4a6f3d7e034f4d.tar.bz2 | |
remove conflict marker
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e1cd54a..48280c3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -336,7 +336,6 @@ (_initialize_infcmd): Update help string for 'until' command. Add new 'advance' command. ->>>>>>> 1.3752 2003-01-14 David Carlton <carlton@math.stanford.edu> * linespec.c (decode_line_1): Normalize comments. |