OSDN Git Service

Clean up conflict marks introduced in revision 1.4254.
authoroliva <oliva@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 4 Sep 1999 18:20:30 +0000 (18:20 +0000)
committeroliva <oliva@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 4 Sep 1999 18:20:30 +0000 (18:20 +0000)
commit7086d72a013ca952df8d8d1aae2fb61e5a24d1a5
tree041baa370800e03dbb73a138f4a5a77dc7491b08
parent38f35d70fd770ee552e677ae8e2b2e9872468b8a
Clean up conflict marks introduced in revision 1.4254.

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