From: Simon Marchi Date: Tue, 19 Jun 2018 00:44:50 +0000 (-0400) Subject: Fix ChangeLog merge conflict X-Git-Tag: binutils-2_31~108 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f63b508a8709da08448ea68c9db7c5d9f168da0c;p=external%2Fbinutils.git Fix ChangeLog merge conflict I noticed that gdb/testsuite/ChangeLog had some conflict markers... this patch fixes it. --- 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 + + PR gdb/16841 + * gdb.cp/typedef-base.cc: New file. + * gdb.cp/typedef-base.exp: New file. + 2018-06-18 Tom de Vries * 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 - - 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