Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-07-07 12:55:10 -0400
committerEike Stepper2010-07-07 12:55:10 -0400
commitc4d3ed8b70f2118652389b604a48c8846866f0ee (patch)
tree371a60f9a72c160a7e8ee7868ab2ab6b02a60c21 /features/org.eclipse.emf.cdo.tests-feature
parente226589b37d964e9d58de60b4ecdc8a66f52a96f (diff)
downloadcdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.tar.gz
cdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.tar.xz
cdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.zip
[319090] Provide a CDOConflictResolver that uses a CDOMerger
https://bugs.eclipse.org/bugs/show_bug.cgi?id=319090
Diffstat (limited to 'features/org.eclipse.emf.cdo.tests-feature')
-rw-r--r--features/org.eclipse.emf.cdo.tests-feature/feature.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
index a2ba7d9d0e..eb611189ce 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.tests"
label="%featureName"
- version="3.0.0.qualifier"
+ version="4.0.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">

Back to the top