diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html index cf90bd2816..343b02bcc1 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!-- NewPage --> -<html lang="de"> +<html lang="en"> <head> <title>CDOConflictResolver (CDO Model Repository Documentation)</title> @@ -113,6 +113,8 @@ var activeTableTab = "activeTableTab"; <dl> <dt><span class="simpleTagLabel">Since:</span></dt> <dd>2.0</dd> +<dt><span class="simpleTagLabel">Author:</span></dt> +<dd>Eike Stepper</dd> <dt><span class="seeLabel">See Also:</span></dt> <dd><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.Options.html#addConflictResolver-org.eclipse.emf.cdo.transaction.CDOConflictResolver-"><code>CDOTransaction.Options.addConflictResolver(CDOConflictResolver)</code></a></dd> </dl> @@ -286,6 +288,6 @@ var activeTableTab = "activeTableTab"; <!-- --> </a></div> <!-- ======== END OF BOTTOM NAVBAR ======= --> -<p class="legalCopy"><small><i>Copyright (c) 2011-2015 Eike Stepper (Berlin, Germany) and others.</i></small></p> +<p class="legalCopy"><small><i class="copyright">Copyright (c) 2014 Eike Stepper (Berlin, Germany) and others.<br>All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html</i></small></p> </body> </html> |