diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractChangeSetsConflictResolver.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractChangeSetsConflictResolver.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/AbstractChangeSetsConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractChangeSetsConflictResolver.html index d0d80ca150..f4d5651b2c 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractChangeSetsConflictResolver.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractChangeSetsConflictResolver.html @@ -116,7 +116,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/spi/cdo/AbstractChangeSetsCon <TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html" title="class in org.eclipse.emf.spi.cdo">CDOMergingConflictResolver</A></B></CODE> <BR> - <B>Deprecated.</B> <I>This conflict resolver is still under development. It's not safe to use it.</I></TD> + If the meaning of this type isn't clear, there really should be more of a description here...</TD> </TR> </TABLE> |