diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html | 6 |
1 files changed, 4 insertions, 2 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 6a72f3e745..67abfd9eba 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 @@ -96,8 +96,10 @@ Interface CDOConflictResolver</H2> </DL>
<HR>
<DL>
-<DT><PRE>public interface <B>CDOConflictResolver</B></DL>
-</PRE><map id="APIVIZ" name="APIVIZ">
+ <DT>public interface <B>CDOConflictResolver</B>
+</DL>
+
+<map id="APIVIZ" name="APIVIZ">
<area shape="rect" id="node1" href="CDOTransaction.Options.html" title="«interface» CDOTransaction.Options" alt="" coords="5,101,171,141"/>
<area shape="rect" id="node2" href="CDOConflictResolver2.html" title="«interface» CDOConflictResolver2" alt="" coords="201,101,351,141"/>
<area shape="rect" id="node3" href="CDOConflictResolver.html" title="«interface» CDOConflictResolver" alt="" coords="110,5,252,45"/>
|