Remove unintentional merge indicators.
authoroldham <oldham@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 10 Jan 2001 00:51:39 +0000 (00:51 +0000)
committeroldham <oldham@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 10 Jan 2001 00:51:39 +0000 (00:51 +0000)
commita2ff4e7f948ff1a559ed37aa9f1b9c5247558a35
tree78252757959d0b6dc97d82d87cf05b60f6f17b83
parent31369e4710209de72f441ddb446896133d7d687e
Remove unintentional merge indicators.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38845 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/testsuite/ChangeLog