diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html index d3d82c97ca..8ffbf6e1ea 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html @@ -193,7 +193,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOConflictRe <TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.html" title="class in org.eclipse.emf.spi.cdo">AbstractChangeSetsConflictResolver</A></B></CODE> <BR> - </TD> + If the meaning of this type isn't clear, there really should be more of a description here...</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -201,7 +201,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOConflictRe <TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/AbstractConflictResolver.html" title="class in org.eclipse.emf.spi.cdo">AbstractConflictResolver</A></B></CODE> <BR> - </TD> + If the meaning of this type isn't clear, there really should be more of a description here...</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -209,7 +209,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOConflictRe <TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.html" title="class in org.eclipse.emf.spi.cdo">AbstractObjectConflictResolver</A></B></CODE> <BR> - </TD> + If the meaning of this type isn't clear, there really should be more of a description here...</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -233,7 +233,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOConflictRe <TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html" title="class in org.eclipse.emf.spi.cdo">AbstractObjectConflictResolver.ThreeWayMerge</A></B></CODE> <BR> - </TD> + If the meaning of this type isn't clear, there really should be more of a description here...</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> |