From owner-cvs-all@FreeBSD.ORG Wed May 2 14:32:48 2012 Return-Path: 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 111BA106564A; Wed, 2 May 2012 14:32:48 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8D328FC16; Wed, 2 May 2012 14:32:47 +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 q42EWlrO031426; Wed, 2 May 2012 14:32:47 GMT (envelope-from sunpoet@repoman.freebsd.org) Received: (from sunpoet@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q42EWlUI031425; Wed, 2 May 2012 14:32:47 GMT (envelope-from sunpoet) Message-Id: <201205021432.q42EWlUI031425@repoman.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Wed, 2 May 2012 14:32:47 +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/node 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2012 14:32:48 -0000 sunpoet 2012-05-02 14:32:47 UTC FreeBSD ports repository Modified files: www/node Makefile Log: - Fix CONFLICTS PR: ports/167507 Submitted by: Po-Chien Lin Approved by: Daniel Lin (maintainer) Revision Changes Path 1.47 +1 -1 ports/www/node/Makefile