diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.ThreeWayMerge.html')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.ThreeWayMerge.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.ThreeWayMerge.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.ThreeWayMerge.html index 70885b54af..66dbffae33 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.ThreeWayMerge.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/AbstractObjectConflictResolver.ThreeWayMerge.html @@ -174,6 +174,6 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflic <!-- ======== 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> |