From owner-cvs-all@FreeBSD.ORG  Mon Jun  4 14:15:22 2012
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 CFF2F106566B;
	Mon,  4 Jun 2012 14:15:22 +0000 (UTC) (envelope-from sem@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A3BC28FC08;
	Mon,  4 Jun 2012 14:15:22 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q54EFMUV061000;
	Mon, 4 Jun 2012 14:15:22 GMT (envelope-from sem@repoman.freebsd.org)
Received: (from sem@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q54EFMBq060999;
	Mon, 4 Jun 2012 14:15:22 GMT (envelope-from sem)
Message-Id: <201206041415.q54EFMBq060999@repoman.freebsd.org>
From: Sergey Matveychuk <sem@FreeBSD.org>
Date: Mon, 4 Jun 2012 14:15:22 +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/net/quagga Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** 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: Mon, 04 Jun 2012 14:15:22 -0000

sem         2012-06-04 14:15:22 UTC

  FreeBSD ports repository

  Modified files:
    net/quagga           Makefile 
  Log:
  - Fix CONFLICT line
  
  Submitted by:   FreeBSD Ports conflicts checker
  Approved by:    maintainer (implicitly)
  
  Revision  Changes    Path
  1.118     +1 -1      ports/net/quagga/Makefile