Remove conflict marker.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 115761a2adbce3f5fab6100bbaa58e29fa9c8676..381700082bffdf583a61bd08740e0da64495218a 100644 (file)
--- 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.