diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2018-06-18 20:44:50 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2018-06-18 20:44:50 -0400 |
| commit | f63b508a8709da08448ea68c9db7c5d9f168da0c (patch) | |
| tree | e53c2b7a70f9cd5d478737e08c4bb6be50635c1f /gdb | |
| parent | e31716b076446c171d2fcd6a4d4ab7d04e618525 (diff) | |
| download | gdb-f63b508a8709da08448ea68c9db7c5d9f168da0c.zip gdb-f63b508a8709da08448ea68c9db7c5d9f168da0c.tar.gz gdb-f63b508a8709da08448ea68c9db7c5d9f168da0c.tar.bz2 | |
Fix ChangeLog merge conflict
I noticed that gdb/testsuite/ChangeLog had some conflict markers... this
patch fixes it.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a812061..358474b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -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> |