From owner-cvs-all@FreeBSD.ORG  Fri Sep  5 13:02:38 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1A85A1065681;
	Fri,  5 Sep 2008 13:02:38 +0000 (UTC)
	(envelope-from tabthorpe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E63838FC15;
	Fri,  5 Sep 2008 13:02:37 +0000 (UTC)
	(envelope-from tabthorpe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m85D2bYt023018;
	Fri, 5 Sep 2008 13:02:37 GMT
	(envelope-from tabthorpe@repoman.freebsd.org)
Received: (from tabthorpe@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85D2bI9023017;
	Fri, 5 Sep 2008 13:02:37 GMT (envelope-from tabthorpe)
Message-Id: <200809051302.m85D2bI9023017@repoman.freebsd.org>
From: Thomas Abthorpe <tabthorpe@FreeBSD.org>
Date: Fri, 5 Sep 2008 13:02:37 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/sysutils/nut Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 05 Sep 2008 13:02:38 -0000

tabthorpe    2008-09-05 13:02:37 UTC

  FreeBSD ports repository

  Modified files:
    sysutils/nut         Makefile 
  Log:
  - Fix CONFLICTS between neon26 and neon28
  
  PR:             ports/126843
  Submitted by:   Josh Paetzel <josh tcbug.org>
  Approved by:    Joerg Pulz <Joerg.Pulz frm2.tum.de> (maintainer)
  
  Revision  Changes    Path
  1.45      +4 -0      ports/sysutils/nut/Makefile