From 90deb75dfb8d7807a4bc480448f0c35529f467c7 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@gcc.gnu.org>
Date: Thu, 18 Jan 2001 14:27:06 +0000
Subject: [PATCH] Remove extraneous conflict indicator

From-SVN: r39122
---
 gcc/testsuite/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2bb910f6c1a..cd369034126 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -39,7 +39,6 @@
 	* gcc.c-torture/compile/20010117-1.c: New test.
 	* gcc.c-torture/compile/20010117-2.c: New test.
 
->>>>>>> 1.1023
 2001-01-15  Toon Moene  <toon@moene.indiv.nluug.nl>
 
 	* g77.f-torture/execute/20010116.[fx]: New test,