From owner-cvs-all@FreeBSD.ORG  Mon Dec 19 11:15:16 2011
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 B0F5D10656E3;
	Mon, 19 Dec 2011 11:15:16 +0000 (UTC)
	(envelope-from erwin@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 872F38FC20;
	Mon, 19 Dec 2011 11:15:16 +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 pBJBFGGg078814;
	Mon, 19 Dec 2011 11:15:16 GMT
	(envelope-from erwin@repoman.freebsd.org)
Received: (from erwin@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id pBJBFG6j078813;
	Mon, 19 Dec 2011 11:15:16 GMT (envelope-from erwin)
Message-Id: <201112191115.pBJBFG6j078813@repoman.freebsd.org>
From: Erwin Lansing <erwin@FreeBSD.org>
Date: Mon, 19 Dec 2011 11:15:16 +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/textproc/pdftohtml/files patch-fofi::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, 19 Dec 2011 11:15:16 -0000

erwin       2011-12-19 11:15:16 UTC

  FreeBSD ports repository

  Modified files:
    textproc/pdftohtml/files patch-fofi::Makefile 
  Log:
  Fix mismerge
  
  Submitted by:   Jan Beich <jbeich@tormail.net>
  
  Revision  Changes    Path
  1.3       +7 -10     ports/textproc/pdftohtml/files/patch-fofi::Makefile