diff mbox

[OB] Remove patch collision markers in testsuite/ChangeLog

Message ID f403045eb71a69db41054adcc996@google.com
State New, archived
Headers

Commit Message

Terekhov, Mikhail via Gdb-patches March 16, 2017, 5:56 p.m. UTC 
  Bleah.

commit 2cc36e25db366d70a975702b61c7700ae934d4d0
Author: Doug Evans <dje@google.com>
Date:   Thu Mar 16 10:39:26 2017 -0700

     Remove collision markers from earlier commit
diff mbox

Patch

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 39ff712e74..aa07cb05ff 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,10 +1,9 @@ 
-<<<<<<< HEAD
  2017-03-16  Thomas Preud'homme  <thomas.preudhomme@arm.com>

  	* gdb.cp/m-static.exp: Fix expectation for prototype of
  	test5.single_constructor and single_constructor::single_constructor.
-=======
-2017-03-15  Doug Evans  <dje@google.com>
+
+2017-03-16  Doug Evans  <dje@google.com>

  	* gdb.guile/scm-value.c (main) Delete locals sptr, sn.
  	* gdb.guile/scm-lazy-string.c: New file.
@@ -12,7 +11,7 @@ 
  	* gdb.guile/scm-lazy-string.exp: ... here, new file.  Add more tests
  	for pointer, array, typedef lazy strings.

-2017-03-15  Doug Evans  <dje@google.com>
+2017-03-16  Doug Evans  <dje@google.com>

  	PR python/17728, python/18439, python/18779
  	* gdb.python/py-value.c (main) Delete locals sptr, sn.
@@ -21,7 +20,6 @@ 
  	* gdb.python/py-value.exp: Move lazy string tests to ...
  	* gdb.python/py-lazy-string.exp: ... here.  Add more tests for pointer,
  	array, typedef lazy strings.
->>>>>>> Fix various python lazy string bugs.

  2017-03-14  Anton Kolesov  <anton.kolesov@synopsys.com>