OSDN Git Service

Remove extraneous conflict indicator
authornathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 18 Jan 2001 14:27:06 +0000 (14:27 +0000)
committernathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 18 Jan 2001 14:27:06 +0000 (14:27 +0000)
commit18a300a7c8265500964a6356d90c0ce88beed6ff
tree73c9c23ace386a204dd5571c1aed040fdc5ece34
parent17553988f5d0923998c9929f3fd4d0c9d0f8cfdb
Remove extraneous conflict indicator

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