Clean up conflict marks introduced in revision 1.4254.
authorAlexandre Oliva <oliva@gcc.gnu.org>
Sat, 4 Sep 1999 18:20:30 +0000 (18:20 +0000)
committerAlexandre Oliva <oliva@gcc.gnu.org>
Sat, 4 Sep 1999 18:20:30 +0000 (18:20 +0000)
commit482cbc74aacb9f764edb4d97722fb0df3c3fd73e
tree041baa370800e03dbb73a138f4a5a77dc7491b08
parente3de40e4c21f6f1a3bb8991499b660ab8ef1df64
Clean up conflict marks introduced in revision 1.4254.

From-SVN: r29105
gcc/ChangeLog