From owner-cvs-src@FreeBSD.ORG Tue Sep 2 04:10:30 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6430416A4BF; Tue, 2 Sep 2003 04:10:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E414944005; Tue, 2 Sep 2003 04:10:29 -0700 (PDT) (envelope-from mbr@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 h82BAT0U057302; Tue, 2 Sep 2003 04:10:29 -0700 (PDT) (envelope-from mbr@repoman.freebsd.org) Received: (from mbr@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82BAT2O057296; Tue, 2 Sep 2003 04:10:29 -0700 (PDT) Message-Id: <200309021110.h82BAT2O057296@repoman.freebsd.org> From: Martin Blapp Date: Tue, 2 Sep 2003 04:10:29 -0700 (PDT) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/contrib/isc-dhcp/client/scripts freebsd X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 11:10:30 -0000 mbr 2003/09/02 04:10:29 PDT FreeBSD src repository Modified files: contrib/isc-dhcp/client/scripts freebsd Log: Resolve conflicts. * rev. 1.22 Revision Changes Path 1.23 +1 -1 src/contrib/isc-dhcp/client/scripts/freebsd