From: Jeff Law <law@gcc.gnu.org>
Date: Tue, 14 Dec 2004 17:46:11 +0000 (-0700)
Subject: Remove >>>  conflict indicator.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0a96f3c694d88ed9f0c97135ca67151540f9d66f;p=gcc.git

Remove >>>  conflict indicator.

From-SVN: r92148
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9a15271da22..18420bfae81 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -71,7 +71,6 @@
 	PR middle-end/18903
 	* gcc.c-torture/compile/pr18903.c: New test.
 
->>>>>>> 1.4750
 2004-12-10  Richard Sandiford  <rsandifo@redhat.com>
 
 	* gcc.c-torture/execute/20041210-1.c: New test.