DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUGĀ·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=35948>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED ANDĀ·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=35948





------- Additional Comments From [EMAIL PROTECTED]  2006-09-26 15:56 -------
(In reply to comment #9)
> Some of the files in the patch have svn conflict markers in them, here's the 
> list:
> 
> $ find src -name *.java | xargs grep -l '<<<<<'
> src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java
> src/java/org/apache/fop/render/java2d/Java2DRenderer.java
> src/java/org/apache/fop/render/ps/PSRenderer.java
> src/java/org/apache/fop/render/ps/PSTextPainter.java

Yes, this is to remind me that I still have merging conflicts to resolve.
Currently those marks just cause even more compilation errors...

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.

Reply via email to