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/class-use/DefaultCDOMerger.Conflict.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/class-use/DefaultCDOMerger.Conflict.html')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.Conflict.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.Conflict.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.Conflict.html index dfa5e9daa0..881dd3dcc1 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.Conflict.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.Conflict.html @@ -116,7 +116,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conf <TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict</A></B></CODE> <BR> - </TD> + If the meaning of this type isn't clear, there really should be more of a description here...</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -124,7 +124,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conf <TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndTargetConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInSourceAndTargetConflict</A></B></CODE> <BR> - </TD> + If the meaning of this type isn't clear, there really should be more of a description here...</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -132,7 +132,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conf <TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict</A></B></CODE> <BR> - </TD> + If the meaning of this type isn't clear, there really should be more of a description here...</TD> </TR> </TABLE> |