From 470ac2acd8a52f33e9ce020d38ea2d0881e6cc84 Mon Sep 17 00:00:00 2001 From: William Cohen Date: Mon, 2 Feb 2009 10:02:13 -0500 Subject: Merge ChangeLog conflict --- testsuite/ChangeLog | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'testsuite') diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index f44c6488..542df531 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,15 +1,12 @@ -<<<<<<< HEAD:testsuite/ChangeLog +2009-02-01 Stan Cox + + * systemtap.base/labels.exp: New. + 2009-01-30 Will Cohen * systemtap.samples/queue_demo.exp: * systemtap.samples/queue_demo.stp: Remove. -======= -2009-02-01 Stan Cox - - * systemtap.base/labels.exp: New. - ->>>>>>> 3d65f39002440cfdeeac94d7a7a6c9a7aead2e54:testsuite/ChangeLog 2009-01-30 Frank Ch. Eigler * semok/twenty.stp: Don't spew so much into systemtap.log. -- cgit