diff options
| author | Kevin Buettner <kevinb@redhat.com> | 2004-02-24 22:35:44 +0000 |
|---|---|---|
| committer | Kevin Buettner <kevinb@redhat.com> | 2004-02-24 22:35:44 +0000 |
| commit | 063cb53aac70316b12d3097f11615d358f529eef (patch) | |
| tree | 55cd22e8939784577e8683de872d787efadc09bb | |
| parent | 54a5c8d8dae326c3e05a73d7e1eeeccb7481484a (diff) | |
| download | gdb-063cb53aac70316b12d3097f11615d358f529eef.zip gdb-063cb53aac70316b12d3097f11615d358f529eef.tar.gz gdb-063cb53aac70316b12d3097f11615d358f529eef.tar.bz2 | |
Remove merge conflict characters.
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 01e8152b..f0c47cd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -70,7 +70,6 @@ * breakpoint.c (print_one_breakpoint): Do not output spaces after printing <PENDING> for a pending breakpoint. ->>>>>>> 1.5456 2004-02-23 Jeff Johnston <jjohnstn@redhat.com> * printcmd.c (print_scalar_formatted): Initialize val_long |