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 | 4 |
1 files changed, 2 insertions, 2 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 8ffbf6e1ea..1e942c8a6e 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 @@ -241,7 +241,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOConflictRe <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> @@ -299,6 +299,6 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOConflictRe <!-- ======== END OF BOTTOM NAVBAR ======= --> <HR> -<i>Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.</i> +<i>Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.</i> </BODY> </HTML> |