Correct merge conflict
authorNeil Booth <neil@gcc.gnu.org>
Sat, 8 Apr 2000 05:03:43 +0000 (05:03 +0000)
committerNeil Booth <neil@gcc.gnu.org>
Sat, 8 Apr 2000 05:03:43 +0000 (05:03 +0000)
commited343779f43f00bfe1196e37ece5878eaf58af2e
tree90b0a3f952773a366615caee438b31a4c4b2ff04
parent3facde269a04c33b91becb5cf4397fb69077895d
Correct merge conflict

From-SVN: r33020
gcc/testsuite/ChangeLog