r149805 - in /trunk/gcc: ChangeLog testsuite/Ch...

[uros@gcc.gnu.org]

Author: uros
Date: Mon Jul 20 10:38:04 2009
New Revision: 149805

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=149805
Log:
	* ChangeLog: Remove conflict markers.
	* testsuite/ChangeLog: Ditto.

Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/testsuite/ChangeLog