fix conflicts
authorAldy Hernandez <aldyh@gcc.gnu.org>
Thu, 21 Mar 2002 23:16:17 +0000 (23:16 +0000)
committerAldy Hernandez <aldyh@gcc.gnu.org>
Thu, 21 Mar 2002 23:16:17 +0000 (23:16 +0000)
commit18523b2c8ec990617ecd4b22be3e4da5b34a0215
treef39d383dc34286a81d0970177ecca25032db602e
parent2cb921f417450d570773b217b30c3e37c4307585
fix conflicts

From-SVN: r51147
gcc/ChangeLog