diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html index 2503a6be51..cf693023db 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html @@ -206,6 +206,6 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.Con <!-- ======== 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> |