Remove merge conflict characters.
This commit is contained in:
parent
54a5c8d8da
commit
063cb53aac
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue