Remove >>> conflict indicator.

From-SVN: r92148

Remove >>> conflict indicator.
From-SVN: r92148
0a96f3c6 · Jeff Law · 0c690ca7 · 0a96f3c6
Commit 0a96f3c6 authored Dec 14, 2004 by Jeff Law
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/testsuite/ChangeLog
+0 -1

No files found.
--- 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.