Remove the residuals of a previous merge conflict.
authorWolfgang Bangerth <bangerth@gcc.gnu.org>
Thu, 15 May 2003 15:02:27 +0000 (09:02 -0600)
committerWolfgang Bangerth <bangerth@gcc.gnu.org>
Thu, 15 May 2003 15:02:27 +0000 (09:02 -0600)
commitce000d1eec7bc89409426551325a1ac6ba233193
tree2e1bf0fc46a6fa41a35f28efdce209d7885ad342
parent486772b126854e26f9dccf4fa6cd631757d7c045
Remove the residuals of a previous merge conflict.

From-SVN: r66826
gcc/ChangeLog