fix conflict markers
authorJason Merrill <jason@gcc.gnu.org>
Thu, 10 Jun 2004 15:50:26 +0000 (11:50 -0400)
committerJason Merrill <jason@gcc.gnu.org>
Thu, 10 Jun 2004 15:50:26 +0000 (11:50 -0400)
commit811d7e77459bb2926e5928b2ad47caf6eaf258fc
tree91a2fb07112cdd0c78a8943149894dc38a1666c6
parent23a60a0436f48f1de4e5bf124f29f0e4a32e7d4e
fix conflict markers

From-SVN: r82926
gcc/ChangeLog