espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-13 11:58:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ChangeLog merge conflict

Browse Source 
I noticed that gdb/testsuite/ChangeLog had some conflict markers... this
patch fixes it.
This commit is contained in:
Simon Marchi
2018-06-18 20:44:50 -04:00
parent e31716b076
commit f63b508a87
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdb/testsuite/ChangeLog
View File

@ -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> 2018-06-18 Tom de Vries <tdevries@suse.de>
* gdb.ada/bp_inlined_func.exp: Allow 5 breakpoint locations. * gdb.ada/bp_inlined_func.exp: Allow 5 breakpoint locations.
@ -96,13 +101,6 @@
* gdb.base/endian.exp: New test. * gdb.base/endian.exp: New test.
* gdb.base/endian.c: New test source. * 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> 2018-05-24 Andrew Burgess <andrew.burgess@embecosm.com>