diff options
| author | Josh Micich <josh@apache.org> | 2009-02-13 00:31:55 +0000 |
|---|---|---|
| committer | Josh Micich <josh@apache.org> | 2009-02-13 00:31:55 +0000 |
| commit | 475cd9bd7095952cf182b35a1c4b76877d9c54b7 (patch) | |
| tree | 83b9a71d67c594629d690490ba6798fb1b25d98f | |
| parent | 1afb1f344b94e64bb340809c381d283bbf07b6e0 (diff) | |
| download | poi-475cd9bd7095952cf182b35a1c4b76877d9c54b7.tar.gz poi-475cd9bd7095952cf182b35a1c4b76877d9c54b7.zip | |
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
| -rw-r--r-- | src/documentation/content/xdocs/status.xml | 1 |
1 files changed, 0 insertions, 1 deletions
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> |