1 files changed, 8 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndTargetConflict.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndTargetConflict.html
index 0d842a8229..85f7e11946 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndTargetConflict.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndTargetConflict.html
@@ -101,13 +101,16 @@ Class DefaultCDOMerger.ChangedInSourceAndTargetConflict</H2>
 <HR>
 <DL>
 <DT><PRE>public static class <B>DefaultCDOMerger.ChangedInSourceAndTargetConflict</B><DT>extends <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.Conflict</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="DefaultCDOMerger.Conflict.html" title="DefaultCDOMerger.Conflict" alt="" coords="85,6,264,31"/>
+<area shape="rect" id="node2" href="DefaultCDOMerger.ChangedInSourceAndTargetConflict.html" title="DefaultCDOMerger.ChangedInSourceAndTargetConflict" alt="" coords="5,71,344,97"/>
+</map>
+
+<CENTER><IMG SRC="DefaultCDOMerger.ChangedInSourceAndTargetConflict.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>