wollman 2003/08/24 14:29:40 PDT FreeBSD src repository Modified files: (Branch: RELENG_4) share/misc iso3166 Log: Delete some merge conflict markers that somehow snuck in here. Noticed by: j.e.drews at worldnet.att.net Revision Changes Path 1.6.2.4 +0 -3 src/share/misc/iso3166