mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-22 19:09:31 +08:00
Remove conflict marker.
This commit is contained in:
@ -39,7 +39,6 @@
|
||||
* mi/mi-cmd-break (mi_cmd_break_commands): Validate commands if
|
||||
it's tracepoint.
|
||||
|
||||
=======
|
||||
2010-03-23 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* Makefile.in (OPCODES_CFLAGS): Add -I$(OPCODES_SRC)/..
|
||||
|
Reference in New Issue
Block a user