OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove merge conflict characters.

This commit is contained in:
Kevin Buettner 2004-02-24 22:35:44 +00:00
parent 54a5c8d8da
commit 063cb53aac
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdb/ChangeLog
View File

@ -70,7 +70,6 @@
* breakpoint.c (print_one_breakpoint): Do not output spaces * breakpoint.c (print_one_breakpoint): Do not output spaces
after printing <PENDING> for a pending breakpoint. after printing <PENDING> for a pending breakpoint.
>>>>>>> 1.5456
2004-02-23 Jeff Johnston <jjohnstn@redhat.com> 2004-02-23 Jeff Johnston <jjohnstn@redhat.com>
* printcmd.c (print_scalar_formatted): Initialize val_long * printcmd.c (print_scalar_formatted): Initialize val_long