Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html13
1 files changed, 8 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html
index a71ff46919..f5718e2d9d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html
@@ -101,13 +101,16 @@ Class DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict</H2>
<HR>
<DL>
<DT><PRE>public static class <B>DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict</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="117,6,296,31"/>
+<area shape="rect" id="node2" href="DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html" title="DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict" alt="" coords="5,71,408,97"/>
+</map>
+
+<CENTER><IMG SRC="DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
<P>
-<DL>
-<DT><B>Author:</B></DT>
- <DD>Eike Stepper</DD>
-</DL>
<HR>
<P>

Back to the top