fix conflicts
authorAldy Hernandez <aldyh@gcc.gnu.org>
Tue, 22 Jan 2002 18:35:50 +0000 (18:35 +0000)
committerAldy Hernandez <aldyh@gcc.gnu.org>
Tue, 22 Jan 2002 18:35:50 +0000 (18:35 +0000)
commit1b21d6a00425ba1eaef5124699c1fc8e9d957152
treeae5b2d66f4fcc5e9ad256c3bd2416eefb175658f
parent2b672c08f3739635275d93dbd1fceadbaf504bf2
fix conflicts

From-SVN: r49083
gcc/ChangeLog