Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-04-13 09:49:46 -0400
committerEike Stepper2011-04-13 09:49:46 -0400
commita56c7d7dbb56ec9a48becf0851c1698cb78ce5ee (patch)
treed62cf30cbd2b94f4fc1637a47c804f32529465d6 /features/org.eclipse.emf.cdo.tests-feature/feature.xml
parentaafe6ac6268b02028dfd9e9ab987a79b8f38bd82 (diff)
downloadcdo-a56c7d7dbb56ec9a48becf0851c1698cb78ce5ee.tar.gz
cdo-a56c7d7dbb56ec9a48becf0851c1698cb78ce5ee.tar.xz
cdo-a56c7d7dbb56ec9a48becf0851c1698cb78ce5ee.zip
[341469] Make CDOMergingConflictResolver stable
https://bugs.eclipse.org/bugs/show_bug.cgi?id=341469
Diffstat (limited to 'features/org.eclipse.emf.cdo.tests-feature/feature.xml')
-rw-r--r--features/org.eclipse.emf.cdo.tests-feature/feature.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
index 805e91fa66..062ecb3af2 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
@@ -127,6 +127,13 @@
unpack="false"/>
<plugin
+ id="org.eclipse.emf.cdo.tests.model6"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.emf.cdo.tests.ui"
download-size="0"
install-size="0"

Back to the top