From: Jeff Johnston <jjohnstn@redhat.com>
Date: Wed, 1 Sep 2004 17:56:39 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: csl-arm-2004-q3~310
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4a74b90e74d762e2e8079cd354abc6885e996e6;p=thirdparty%2Fbinutils-gdb.git

Remove conflict marker.
---

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.