Remove conflict marker.

This commit is contained in:
Vladimir Prus 2010-03-23 21:34:30 +00:00
parent a7bdde9e63
commit 58ddf7c9cd
1 changed files with 0 additions and 1 deletions

View File

@ -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)/..