From: Josh Micich <josh@apache.org>
Date: Fri, 13 Feb 2009 00:31:55 +0000 (+0000)
Subject: removed merge marker accidentally left behind in r653822
X-Git-Tag: REL_3_5_BETA6~122
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=475cd9bd7095952cf182b35a1c4b76877d9c54b7;p=poi.git

removed merge marker accidentally left behind in r653822

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@743936 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 126a0876b9..7b95e677a0 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -279,7 +279,6 @@
         </release>
         <release version="3.1-beta1" date="2008-04-28">
            <action dev="POI-DEVELOPERS" type="fix">44857 - Avoid OOM on unknown escher records when EscherMetafileBlip is incorrect</action>
->>>>>>> .merge-right.r653675
            <action dev="POI-DEVELOPERS" type="add">HSLF: Support for getting embedded sounds from slide show </action>
            <action dev="POI-DEVELOPERS" type="add">HSLF: Initial support for rendering slides into images</action>
            <action dev="POI-DEVELOPERS" type="add">HSLF: Support for getting OLE object data from slide show </action>