Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-07-07 16:55:10 +0000
committerEike Stepper2010-07-07 16:55:10 +0000
commitc4d3ed8b70f2118652389b604a48c8846866f0ee (patch)
tree371a60f9a72c160a7e8ee7868ab2ab6b02a60c21 /plugins/org.eclipse.emf.cdo.server.objectivity.stub
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 'plugins/org.eclipse.emf.cdo.server.objectivity.stub')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters11
1 files changed, 0 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters
deleted file mode 100644
index f9b693c521..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.emf.cdo.server.objectivity.stub" version="2">
- <resource path="META-INF/MANIFEST.MF">
- <filter id="924844039">
- <message_arguments>
- <message_argument value="3.0.100.qualifier"/>
- <message_argument value="3.0.0.v20100614-1655"/>
- </message_arguments>
- </filter>
- </resource>
-</component>

Back to the top