diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html index 38bbe7c696..130a883722 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html @@ -115,6 +115,10 @@ Class DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict</H2> <P> +If the meaning of this type isn't clear, there really should be more of a description here... +<P> + +<P> <HR> <P> |