From c4d3ed8b70f2118652389b604a48c8846866f0ee Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Wed, 7 Jul 2010 16:55:10 +0000
Subject: [319090] Provide a CDOConflictResolver that uses a CDOMerger
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=319090

---
 features/org.eclipse.emf.cdo.tests-feature/feature.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'features/org.eclipse.emf.cdo.tests-feature')

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">
 
-- 
cgit v1.2.3