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/CDOMergingConflictResolver.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html26
1 files changed, 22 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html
index a2d6bff7c2..0ba15725b8 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html
@@ -148,6 +148,12 @@ If the meaning of this type isn't clear, there really should be more of a descri
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html#CDOMergingConflictResolver(org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference)">CDOMergingConflictResolver</A></B>(<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</A>&nbsp;resolutionPreference)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<!-- ========== METHOD SUMMARY =========== -->
@@ -215,18 +221,30 @@ If the meaning of this type isn't clear, there really should be more of a descri
</TR>
</TABLE>
-<A NAME="CDOMergingConflictResolver()"><!-- --></A><H3>
+<A NAME="CDOMergingConflictResolver(org.eclipse.emf.cdo.transaction.CDOMerger)"><!-- --></A><H3>
CDOMergingConflictResolver</H3>
<PRE>
-public <B>CDOMergingConflictResolver</B>()</PRE>
+public <B>CDOMergingConflictResolver</B>(<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</A>&nbsp;merger)</PRE>
<DL>
</DL>
<HR>
-<A NAME="CDOMergingConflictResolver(org.eclipse.emf.cdo.transaction.CDOMerger)"><!-- --></A><H3>
+<A NAME="CDOMergingConflictResolver(org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference)"><!-- --></A><H3>
CDOMergingConflictResolver</H3>
<PRE>
-public <B>CDOMergingConflictResolver</B>(<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</A>&nbsp;merger)</PRE>
+public <B>CDOMergingConflictResolver</B>(<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</A>&nbsp;resolutionPreference)</PRE>
+<DL>
+<DL>
+<DT><B>Since:</B></DT>
+ <DD>4.2</DD>
+</DL>
+</DL>
+<HR>
+
+<A NAME="CDOMergingConflictResolver()"><!-- --></A><H3>
+CDOMergingConflictResolver</H3>
+<PRE>
+public <B>CDOMergingConflictResolver</B>()</PRE>
<DL>
</DL>

Back to the top