Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html
index f79e5cf7d0..8132ab1f85 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html
@@ -156,7 +156,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Enumerates the possible sides of a merge, i.e., <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html#SOURCE"><CODE>DefaultCDOMerger.PerFeature.ManyValued.Side.SOURCE</CODE></A> and <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html#TARGET"><CODE>DefaultCDOMerger.PerFeature.ManyValued.Side.TARGET</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;<A NAME="nested_classes_inherited_from_class_org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature"><!-- --></A>

Back to the top