1 files changed, 10 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html
index 106fda0f83..dd98bc96c4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html
@@ -99,7 +99,16 @@ Interface CDOConflictResolver</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>CDOConflictResolver</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOTransaction.Options.html" title="&#171;interface&#187; CDOTransaction.Options" alt="" coords="5,101,171,141"/>
+<area shape="rect" id="node2" href="CDOConflictResolver2.html" title="&#171;interface&#187; CDOConflictResolver2" alt="" coords="201,101,351,141"/>
+<area shape="rect" id="node3" href="CDOConflictResolver.html" title="&#171;interface&#187; CDOConflictResolver" alt="" coords="205,5,347,45"/>
+<area shape="rect" id="node4" href="../../spi/cdo/AbstractConflictResolver.html" title="AbstractConflictResolver (org.eclipse.emf.spi.cdo)" alt="" coords="381,101,547,141"/>
+</map>
+
+<CENTER><IMG SRC="CDOConflictResolver.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 A strategy used to customize the default conflict resolution behaviour of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transactions</CODE></A>.
@@ -109,8 +118,6 @@ A strategy used to customize the default conflict resolution behaviour of <A HRE
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.Options.html#addConflictResolver(org.eclipse.emf.cdo.transaction.CDOConflictResolver)"><CODE>CDOTransaction.Options.addConflictResolver(CDOConflictResolver)</CODE></A></DL>
 <HR>