1 files changed, 8 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html
index 9705b0255e..f81ce639dc 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html
@@ -105,14 +105,19 @@ Class CDOMergingConflictResolver</H2>
 <DL>
 <DT><PRE><FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
 </FONT>public class <B>CDOMergingConflictResolver</B><DT>extends <A HREF="../../../../../org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.html" title="class in org.eclipse.emf.spi.cdo">AbstractChangeSetsConflictResolver</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="AbstractChangeSetsConflictResolver.html" title="AbstractChangeSetsConflictResolver" alt="" coords="5,6,243,31"/>
+<area shape="rect" id="node2" href="CDOMergingConflictResolver.html" title="CDOMergingConflictResolver" alt="" coords="30,71,217,97"/>
+</map>
+
+<CENTER><IMG SRC="CDOMergingConflictResolver.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>4.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>