Remove conflict marker
authorAndreas Schwab <schwab@gcc.gnu.org>
Sat, 6 Aug 2011 10:07:58 +0000 (10:07 +0000)
committerAndreas Schwab <schwab@gcc.gnu.org>
Sat, 6 Aug 2011 10:07:58 +0000 (10:07 +0000)
commit2c7f9cc0766065cd7d1e5788a18b43b5c0d8b023
tree17d2c2487c9088e3317a00fbecf6867f6aae2581
parente2852612bfafd06e567df75699333fc27745a9c2
Remove conflict marker

From-SVN: r177507
gcc/ada/ChangeLog