1 files changed, 10 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html
index 1e109db5ec..325b96078b 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html
@@ -103,13 +103,18 @@ Class DefaultCDOMerger.Conflict</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract static class <B>DefaultCDOMerger.Conflict</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="DefaultCDOMerger.Conflict.html" title="DefaultCDOMerger.Conflict" alt="" coords="517,6,696,31"/>
+<area shape="rect" id="node2" href="DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html" title="DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict" alt="" coords="5,71,408,97"/>
+<area shape="rect" id="node3" href="DefaultCDOMerger.ChangedInSourceAndTargetConflict.html" title="DefaultCDOMerger.ChangedInSourceAndTargetConflict" alt="" coords="437,71,776,97"/>
+<area shape="rect" id="node4" href="DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html" title="DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict" alt="" coords="805,71,1208,97"/>
+</map>
+
+<CENTER><IMG SRC="DefaultCDOMerger.Conflict.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>