r114928 - /trunk/gcc/ChangeLog

[schwab@gcc.gnu.org]

Author: schwab
Date: Fri Jun 23 09:41:38 2006
New Revision: 114928

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

Modified:
    trunk/gcc/ChangeLog