[obvious] Kill left-over merge marker
This commit is contained in:
parent
f47a1d2eb8
commit
1b88d5c487
1 changed files with 0 additions and 1 deletions
|
@ -1041,7 +1041,6 @@
|
|||
RETVAL_EXPR for UNOP_CAST and set RETURN_TYPE to the RETURN_VALUE type
|
||||
if RETURN_TYPE is NULL.
|
||||
|
||||
>>>>>>> 1.10280
|
||||
2009-03-14 Pedro Alves <pedro@codesourcery.com>
|
||||
|
||||
* remote.c (PACKET_qAttached): New.
|
||||
|
|
Loading…
Add table
Reference in a new issue