Remove extraneous conflict indicator
authorNathan Sidwell <nathan@gcc.gnu.org>
Thu, 18 Jan 2001 14:27:06 +0000 (14:27 +0000)
committerNathan Sidwell <nathan@gcc.gnu.org>
Thu, 18 Jan 2001 14:27:06 +0000 (14:27 +0000)
commit90deb75dfb8d7807a4bc480448f0c35529f467c7
tree73c9c23ace386a204dd5571c1aed040fdc5ece34
parentf5ceeec84f7ef85b96400b54d0e2276a0c0a2ef7
Remove extraneous conflict indicator

From-SVN: r39122
gcc/testsuite/ChangeLog