diff options
author | Eike Stepper | 2012-09-01 10:12:40 +0000 |
---|---|---|
committer | Eike Stepper | 2012-09-01 10:12:40 +0000 |
commit | 617fe3dcf7b31291514a06b64ffabb8e6545b3aa (patch) | |
tree | a7d0a820aec5dee2d5045b47c811570238d01638 /plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html | |
parent | 27ced0f92cd49702142bb8db0a05fbe7b48d35c1 (diff) | |
download | cdo-617fe3dcf7b31291514a06b64ffabb8e6545b3aa.tar.gz cdo-617fe3dcf7b31291514a06b64ffabb8e6545b3aa.tar.xz cdo-617fe3dcf7b31291514a06b64ffabb8e6545b3aa.zip |
Update docs
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.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.ChangedInTargetAndDetachedInSourceConflict.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html index a1db283595..3ed6cebc93 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html @@ -115,6 +115,10 @@ Class DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict</H2> <P> +If the meaning of this type isn't clear, there really should be more of a description here... +<P> + +<P> <HR> <P> |