From owner-cvs-src@FreeBSD.ORG  Tue Apr 20 02:47:14 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
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 9D8E316A4CE; Tue, 20 Apr 2004 02:47:14 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7F39C43D54; Tue, 20 Apr 2004 02:47:14 -0700 (PDT)
	(envelope-from des@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3K9lEGe022075;
	Tue, 20 Apr 2004 02:47:14 -0700 (PDT)
	(envelope-from des@repoman.freebsd.org)
Received: (from des@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3K9lDin022074;
	Tue, 20 Apr 2004 02:47:13 -0700 (PDT)
	(envelope-from des)
Message-Id: <200404200947.i3K9lDin022074@repoman.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Tue, 20 Apr 2004 02:47:13 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/crypto/openssh readconf.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Apr 2004 09:47:14 -0000

des         2004/04/20 02:47:13 PDT

  FreeBSD src repository

  Modified files:
    crypto/openssh       readconf.c 
  Log:
  One more conflict.
  
  Revision  Changes    Path
  1.23      +2 -6      src/crypto/openssh/readconf.c