From 2cc36e25db366d70a975702b61c7700ae934d4d0 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Thu, 16 Mar 2017 10:39:26 -0700 Subject: [PATCH] Remove collision markers from earlier commit --- gdb/testsuite/ChangeLog | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 39ff712e74b..aa07cb05ffb 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,10 +1,9 @@ -<<<<<<< HEAD 2017-03-16 Thomas Preud'homme * gdb.cp/m-static.exp: Fix expectation for prototype of test5.single_constructor and single_constructor::single_constructor. -======= -2017-03-15 Doug Evans + +2017-03-16 Doug Evans * 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 +2017-03-16 Doug Evans 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 -- 2.30.2