r125260 - /trunk/ChangeLog

[schwab@gcc.gnu.org]

Author: schwab
Date: Fri Jun  1 08:51:05 2007
New Revision: 125260

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=125260
Log:
Remove conflict marker.

Modified:
    trunk/ChangeLog