fix conflicts
commitaac536ea8681650b305b0f0d3f55cda1bdbda336
authoraldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 21 Mar 2002 23:16:17 +0000 (21 23:16 +0000)
committeraldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 21 Mar 2002 23:16:17 +0000 (21 23:16 +0000)
treef39d383dc34286a81d0970177ecca25032db602e
parentc31da6e7ee76fb3e31316d408f4ac94dd07b0ead
fix conflicts

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