From: Jeremias Maerki <jeremias@apache.org>
Date: Sun, 22 Feb 2009 11:07:43 +0000 (+0000)
Subject: Trying to work around a problem reintegrating the branch. Found a blog entry that... 
X-Git-Tag: fop-1_0~311^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fheads%2FTemp_AreaTreeNewDesign;p=xmlgraphics-fop.git

Trying to work around a problem reintegrating the branch. Found a blog entry that lists deleting mergeinfo entries in subdirectories as a possible solution. Hopefully, this will help.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign@746655 13f79535-47bb-0310-9956-ffa450edef68
---