remove conflict indicator
authorAlan Modra <amodra@gmail.com>
Fri, 10 Jun 2005 00:41:30 +0000 (00:41 +0000)
committerAlan Modra <amodra@gmail.com>
Fri, 10 Jun 2005 00:41:30 +0000 (00:41 +0000)
commit80f564490031cd5ffd14617ca2fa126e44922ec4
tree7d35511157a372a3e5713f3978bbdf722eaf803e
parent9d12f64cdc6540b75938097d7f4ab460bb346528
remove conflict indicator
ld/ChangeLog