remove conflict marker
This commit is contained in:
parent
baa93fa6f9
commit
c4c31f17e8
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue