Remove extraneous conflict indicator

From-SVN: r39122

Remove extraneous conflict indicator
From-SVN: r39122
90deb75d · Nathan Sidwell · f5ceeec8 · 90deb75d
Commit 90deb75d authored Jan 18, 2001 by Nathan Sidwell
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
@@ -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,