From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Tue, 19 Jun 2018 00:44:50 +0000 (-0400)
Subject: Fix ChangeLog merge conflict
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f63b508a8709da08448ea68c9db7c5d9f168da0c;p=binutils-gdb.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 a8120613874..358474b1e33 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>