Remove extraneous conflict indicator

From-SVN: r39122
This commit is contained in:
Nathan Sidwell 2001-01-18 14:27:06 +00:00
parent f5ceeec84f
commit 90deb75dfb
1 changed files with 0 additions and 1 deletions

View File

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