OSDN Git Service

remove conflict indicator
authorAlan Modra <amodra@bigpond.net.au>
Fri, 10 Jun 2005 00:41:30 +0000 (00:41 +0000)
committerAlan Modra <amodra@bigpond.net.au>
Fri, 10 Jun 2005 00:41:30 +0000 (00:41 +0000)
commit25da58274f3b2c8ff61315014b3a8c1eba3070ca
tree2e6a5bff917dbc7e73db7a458348ba7b47cb015c
parent8b1705ddc8dff54850c6ce405d2671b9f1549d44
remove conflict indicator
ld/ChangeLog