diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.html index 67fc1aecab..86a55bcdea 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.html @@ -132,7 +132,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflic <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> </TABLE> |