comparison man/info.texi @ 70111:9f68cc95e2da

Remove conflict marker.
author Romain Francoise <romain@orebokech.com>
date Wed, 19 Apr 2006 06:29:47 +0000
parents 11b616eddda4
children 926119f309e8 c1e013e3dc0e e6bf73e43cf4
comparison
equal deleted inserted replaced
70110:ce4a07c75843 70111:9f68cc95e2da