From owner-freebsd-commit  Fri Jul  7 16:50:16 1995
Return-Path: commit-owner
Received: (from majordom@localhost)
          by freefall.cdrom.com (8.6.10/8.6.6) id QAA28964
          for commit-outgoing; Fri, 7 Jul 1995 16:50:16 -0700
Received: (from majordom@localhost)
          by freefall.cdrom.com (8.6.10/8.6.6) id QAA28951
          for cvs-ports-outgoing; Fri, 7 Jul 1995 16:50:14 -0700
Received: (from ache@localhost)
          by freefall.cdrom.com (8.6.10/8.6.6) id QAA28940
          ; Fri, 7 Jul 1995 16:50:11 -0700
Date: Fri, 7 Jul 1995 16:50:11 -0700
From: "Andrey A. Chernov" <ache>
Message-Id: <199507072350.QAA28940@freefall.cdrom.com>
To: CVS-commiters, cvs-ports
Subject: cvs commit: ports/utils/pgp Makefile
Sender: commit-owner@FreeBSD.org
Precedence: bulk

ache        95/07/07 16:50:11

  Added:       utils/pgp  Makefile
  Log:
  Fix commit conflict