OSDN Git Service

* ChangeLog: Remove conflict markers.
authoruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 20 Jul 2009 10:38:04 +0000 (10:38 +0000)
committeruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 20 Jul 2009 10:38:04 +0000 (10:38 +0000)
commit8097362b548d69058a302d6d1ad2f5aac4fb624a
tree028d13e74ccd0016d27652de0bebea0a0ea6282f
parent0ce30983f933ff5c8969d70a6e87c734fbb8af21
* ChangeLog: Remove conflict markers.
* testsuite/ChangeLog: Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149805 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/ChangeLog
gcc/testsuite/ChangeLog