Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html
index 2f9b311614..2d111ebbf2 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html
@@ -238,7 +238,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.htm
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html#isValid-org.eclipse.emf.ecore.EObject-org.eclipse.emf.common.notify.Adapter-">isValid</a></span>(<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EObject</a>&nbsp;object,
<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify">Adapter</a>&nbsp;adapter)</code>
-<div class="block">Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behaviour,
+<div class="block">Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behavior,
<code>false</code> otherwise.</div>
</td>
</tr>
@@ -337,7 +337,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.htm
<pre>public&nbsp;boolean&nbsp;isValid(<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EObject</a>&nbsp;object,
<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify">Adapter</a>&nbsp;adapter)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#isValid-org.eclipse.emf.ecore.EObject-org.eclipse.emf.common.notify.Adapter-">CDOAdapterPolicy</a></code></span></div>
-<div class="block">Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behaviour,
+<div class="block">Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behavior,
<code>false</code> otherwise.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>

Back to the top