Fix ChangeLog merge conflict
I noticed that gdb/testsuite/ChangeLog had some conflict markers... this patch fixes it.
This commit is contained in:
parent
e31716b076
commit
f63b508a87
|
@ -1,4 +1,9 @@
|
|||
<<<<<<< HEAD
|
||||
2018-06-18 Weimin Pan <weimin.pan@oracle.com>
|
||||
|
||||
PR gdb/16841
|
||||
* gdb.cp/typedef-base.cc: New file.
|
||||
* gdb.cp/typedef-base.exp: New file.
|
||||
|
||||
2018-06-18 Tom de Vries <tdevries@suse.de>
|
||||
|
||||
* gdb.ada/bp_inlined_func.exp: Allow 5 breakpoint locations.
|
||||
|
@ -96,13 +101,6 @@
|
|||
|
||||
* gdb.base/endian.exp: New test.
|
||||
* gdb.base/endian.c: New test source.
|
||||
=======
|
||||
2018-06-12 Weimin Pan <weimin.pan@oracle.com>
|
||||
|
||||
PR gdb/16841
|
||||
* gdb.cp/typedef-base.cc: New file.
|
||||
* gdb.cp/typedef-base.exp: New file.
|
||||
>>>>>>> Fix failure to find member of a typedef base class
|
||||
|
||||
2018-05-24 Andrew Burgess <andrew.burgess@embecosm.com>
|
||||
|
||||
|
|
Loading…
Reference in New Issue