diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html index 6c4d55cc35..dda20291fa 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html @@ -106,8 +106,11 @@ Class CDOMerger.ConflictException</H2> </DL>
<HR>
<DL>
-<DT><PRE>public static class <B>CDOMerger.ConflictException</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">RuntimeException</A></DL>
-</PRE><map id="APIVIZ" name="APIVIZ">
+ <DT>public static class <B>CDOMerger.ConflictException</B>
+ <DD>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">RuntimeException</A>
+</DL>
+
+<map id="APIVIZ" name="APIVIZ">
<area shape="rect" id="node1" title="«exception» RuntimeException (java.lang)" alt="" coords="39,6,167,61"/>
<area shape="rect" id="node2" href="CDOMerger.ConflictException.html" title="«exception» CDOMerger.ConflictException" alt="" coords="5,100,200,140"/>
</map>
|