Remove ">>>>>>> .r123627".
authorH.J. Lu <hjl@gcc.gnu.org>
Fri, 6 Apr 2007 21:24:17 +0000 (14:24 -0700)
committerH.J. Lu <hjl@gcc.gnu.org>
Fri, 6 Apr 2007 21:24:17 +0000 (14:24 -0700)
commit64199a9eedbd34833b7712d6da13d117fa3ef9f4
tree216471f69b8e9f974421770065bcd4a91b821972
parent4de5c5d3bf98f4fa827ecc4fd07d49e77761e43a
Remove ">>>>>>> .r123627".

From-SVN: r123629
gcc/ChangeLog