r177507 - /trunk/gcc/ada/ChangeLog

[schwab@gcc.gnu.org]

Author: schwab
Date: Sat Aug  6 10:07:58 2011
New Revision: 177507

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

Modified:
    trunk/gcc/ada/ChangeLog