From owner-freebsd-commit  Tue Jul 25 19:47:04 1995
Return-Path: commit-owner
Received: (from majordom@localhost)
          by freefall.cdrom.com (8.6.11/8.6.6) id TAA29179
          for commit-outgoing; Tue, 25 Jul 1995 19:47:04 -0700
Received: (from majordom@localhost)
          by freefall.cdrom.com (8.6.11/8.6.6) id TAA29144
          for cvs-share-outgoing; Tue, 25 Jul 1995 19:46:58 -0700
Received: (from jkh@localhost)
          by freefall.cdrom.com (8.6.11/8.6.6) id TAA29117
          ; Tue, 25 Jul 1995 19:46:50 -0700
Date: Tue, 25 Jul 1995 19:46:50 -0700
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199507260246.TAA29117@freefall.cdrom.com>
To: CVS-commiters, cvs-share
Subject: cvs commit: src/share/FAQ/Text CONTRIB.FreeBSD
Sender: commit-owner@FreeBSD.org
Precedence: bulk

jkh         95/07/25 19:46:49

  Branch:      share/FAQ/Text  RELENG_2_1_0
  Modified:    share/FAQ/Text  CONTRIB.FreeBSD
  Log:
  Looks like some clashes made it into that last merge.  Fix them.