Remove stray conflict marker.
authorJim Meyering <jim@meyering.net>
Wed, 25 Jan 2006 17:31:46 +0000 (17:31 +0000)
committerJim Meyering <jim@meyering.net>
Wed, 25 Jan 2006 17:31:46 +0000 (17:31 +0000)
commit2096a4498c5cc195e7f72e43f78bd88900558bfd
tree8136e5247895b18fc4634206ffd3f2778c6f6a0d
parentfc2646424797626142b4e2fa4ff7a01c97f7d495
Remove stray conflict marker.
lib/ChangeLog