diff options
author | Tom Schindl | 2016-12-11 18:40:49 +0000 |
---|---|---|
committer | Tom Schindl | 2016-12-11 18:40:49 +0000 |
commit | e92d63011d109f68dce336b916c9e3ba101d44ab (patch) | |
tree | ed673bb09c16ed510593edf2ae9503bfd06d0eea | |
parent | d1033754dd1c4eaa153532ad67a73801c85356d2 (diff) | |
download | org.eclipse.efxclipse-e92d63011d109f68dce336b916c9e3ba101d44ab.tar.gz org.eclipse.efxclipse-e92d63011d109f68dce336b916c9e3ba101d44ab.tar.xz org.eclipse.efxclipse-e92d63011d109f68dce336b916c9e3ba101d44ab.zip |
fixes merge problem
-rwxr-xr-x | bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF index 13f759802..cdcb40cbd 100755 --- a/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF +++ b/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF @@ -24,17 +24,6 @@ Export-Package: org.eclipse.fx.core;version="3.0.0", org.eclipse.fx.core.update;version="3.0.0" Bundle-Vendor: %Bundle-Vendor
Service-Component: OSGI-INF/services/org.eclipse.fx.core.internal.JAXBObjectSerializer.xml, - OSGI-INF/services/org.eclipse.fx.core.internal.JUtilLoggerFactory.xml, - OSGI-INF/services/org.eclipse.fx.core.adapter.internal.AdapterServiceImpl.xml, - OSGI-INF/services/org.eclipse.fx.core.internal.FileSystemServiceImpl.xml, - OSGI-INF/services/org.eclipse.fx.core.internal.DefaultValueSerializer.xml, - OSGI-INF/services/org.eclipse.fx.core.internal.DynamicDataStreamHandler.xml, - OSGI-INF/services/org.eclipse.fx.core.internal.TplURLDynamicDataStreamHandler.xml, - OSGI-INF/services/org.eclipse.fx.core.internal.OSGiEventBusImpl.xml
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
- com.google.guava;bundle-version="15.0.0"
-Service-Component: OSGI-INF/services/org.eclipse.fx.core.internal.JAXBObjectSerializer.xml, OSGI-INF/services/org.eclipse.fx.core.adapter.internal.AdapterServiceImpl.xml, OSGI-INF/services/org.eclipse.fx.core.internal.JUtilLoggerFactory.xml, OSGI-INF/services/org.eclipse.fx.core.internal.OSGiEventBusImpl.xml, @@ -43,3 +32,5 @@ Service-Component: OSGI-INF/services/org.eclipse.fx.core.internal.JAXBObjectSeri OSGI-INF/services/org.eclipse.fx.core.internal.FileSystemServiceImpl.xml, OSGI-INF/services/org.eclipse.fx.core.internal.DynamicDataStreamHandler.xml
Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
+ com.google.guava;bundle-version="15.0.0"
|