From owner-cvs-all  Sat Feb  8 15:43:59 2003
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 90A5F37B401; Sat,  8 Feb 2003 15:43:57 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2A68B43FB1; Sat,  8 Feb 2003 15:43:57 -0800 (PST)
	(envelope-from will@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 h18Nhubv037347;
	Sat, 8 Feb 2003 15:43:56 -0800 (PST)
	(envelope-from will@repoman.freebsd.org)
Received: (from will@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18NhuLp037346;
	Sat, 8 Feb 2003 15:43:56 -0800 (PST)
Message-Id: <200302082343.h18NhuLp037346@repoman.freebsd.org>
From: Will Andrews <will@FreeBSD.org>
Date: Sat, 8 Feb 2003 15:43:56 -0800 (PST)
To: doc-committers@FreeBSD.org, cvs-doc@FreeBSD.org,
	cvs-all@FreeBSD.org, legacy-committers@FreeBSD.org
Subject: cvs commit: doc/en_US.ISO8859-1/articles/committers-guide article.sgml
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

will        2003/02/08 15:43:56 PST

  Modified files:
    en_US.ISO8859-1/articles/committers-guide article.sgml 
  Log:
  Add suggestions for conflict resolution.
  
  Submitted by:   wes
  Reviewed by:    grog, imp
  
  Revision  Changes    Path
  1.154     +24 -0     doc/en_US.ISO8859-1/articles/committers-guide/article.sgml

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message