From owner-cvs-ports@FreeBSD.ORG  Wed Apr 18 17:36:26 2012
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 217591065670;
	Wed, 18 Apr 2012 17:36:26 +0000 (UTC)
	(envelope-from lwhsu@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E92F28FC22;
	Wed, 18 Apr 2012 17:36:25 +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 q3IHaPPK008470;
	Wed, 18 Apr 2012 17:36:25 GMT
	(envelope-from lwhsu@repoman.freebsd.org)
Received: (from lwhsu@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q3IHaPWa008469;
	Wed, 18 Apr 2012 17:36:25 GMT (envelope-from lwhsu)
Message-Id: <201204181736.q3IHaPWa008469@repoman.freebsd.org>
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Date: Wed, 18 Apr 2012 17:36:25 +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/www/py-django Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2012 17:36:26 -0000

lwhsu       2012-04-18 17:36:25 UTC

  FreeBSD ports repository

  Modified files:
    www/py-django        Makefile 
  Log:
  - Fix CONFLICTS
  
  Revision  Changes    Path
  1.44      +1 -1      ports/www/py-django/Makefile