From owner-cvs-all  Tue Feb 13 14:40:33 2001
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id DBC7A37B491; Tue, 13 Feb 2001 14:40:29 -0800 (PST)
Received: (from assar@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f1DMeT683449;
	Tue, 13 Feb 2001 14:40:29 -0800 (PST)
	(envelope-from assar)
Message-Id: <200102132240.f1DMeT683449@freefall.freebsd.org>
From: Assar Westerlund <assar@FreeBSD.org>
Date: Tue, 13 Feb 2001 14:40:29 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/heimdal/lib/krb5 krb5_locl.h
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

assar       2001/02/13 14:40:29 PST

  Modified files:
    crypto/heimdal/lib/krb5 krb5_locl.h 
  Log:
  nuke conflict markers
  
  Revision  Changes    Path
  1.5       +1 -5      src/crypto/heimdal/lib/krb5/krb5_locl.h



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