fix conflicts
authoraldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 22 Jan 2002 18:35:50 +0000 (18:35 +0000)
committeraldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 22 Jan 2002 18:35:50 +0000 (18:35 +0000)
commitfd851023a791f19c89183da9ff4f0090568768a4
treeae5b2d66f4fcc5e9ad256c3bd2416eefb175658f
parent99f5f7d8516f009f8f016a23e1bb9a1a53debd62
fix conflicts

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