From owner-cvs-all@FreeBSD.ORG  Sun Aug 24 14:29:41 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 4572F16A4BF; Sun, 24 Aug 2003 14:29:41 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id BB31C43FB1; Sun, 24 Aug 2003 14:29:40 -0700 (PDT)
	(envelope-from wollman@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7OLTe0U081651;
	Sun, 24 Aug 2003 14:29:40 -0700 (PDT)
	(envelope-from wollman@repoman.freebsd.org)
Received: (from wollman@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7OLTemA081650;
	Sun, 24 Aug 2003 14:29:40 -0700 (PDT)
Message-Id: <200308242129.h7OLTemA081650@repoman.freebsd.org>
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Sun, 24 Aug 2003 14:29:40 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4
Subject: cvs commit: src/share/misc iso3166
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Aug 2003 21:29:41 -0000

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@worldnet.att.net
  
  Revision  Changes    Path
  1.6.2.4   +0 -3      src/share/misc/iso3166