From owner-cvs-all@FreeBSD.ORG  Tue Apr 12 04:22:45 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 CC0CD16A4CE; Tue, 12 Apr 2005 04:22:45 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id A3ADD43D1F; Tue, 12 Apr 2005 04:22:45 +0000 (GMT)
	(envelope-from adamw@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3C4MjNk088411;
	Tue, 12 Apr 2005 04:22:45 GMT
	(envelope-from adamw@repoman.freebsd.org)
Received: (from adamw@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3C4Mj2u088410;
	Tue, 12 Apr 2005 04:22:45 GMT
	(envelope-from adamw)
Message-Id: <200504120422.j3C4Mj2u088410@repoman.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Tue, 12 Apr 2005 04:22:45 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/devel/gindent Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Apr 2005 04:22:46 -0000

adamw       2005-04-12 04:22:45 UTC

  FreeBSD ports repository

  Modified files:
    devel/gindent        Makefile 
  Log:
  *sigh* This is why even cursory inspections of diffs is a good
  idea. Remove the re-added CVS conflict lines.
  
  Revision  Changes    Path
  1.35      +0 -10     ports/devel/gindent/Makefile