From e4a74b90e74d762e2e8079cd354abc6885e996e6 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Wed, 1 Sep 2004 17:56:39 +0000
Subject: [PATCH] Remove conflict marker.

---
 gdb/testsuite/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 115761a2adb..381700082bf 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -80,7 +80,6 @@
 	* gdb.mi/basics.c: Add copyright notice.
 	* gdb.mi/var-cmd.c: Add copyright notice.
 
->>>>>>> 1.1015
 2004-08-23  Michael Chastain  <mec.gnu@mindspring.com>
 
 	* lib/gdb.exp: Remove signed_keyword_not_used.
-- 
2.30.2