X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2FMETA-INF%2FMANIFEST.MF;fp=bundles%2Forg.simantics.document.server%2FMETA-INF%2FMANIFEST.MF;h=d7b561f8f7f653e4359904f40782d16578d71ac9;hb=25b0e1909c94977871479b469da722ed38e980c0;hp=875ff601fa3b244b464bfae6afaf817f0c6a47d2;hpb=6326b65c5c6a785aadcb615cb95ceadd8f53964a;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.server/META-INF/MANIFEST.MF b/bundles/org.simantics.document.server/META-INF/MANIFEST.MF
index 875ff601f..d7b561f8f 100644
--- a/bundles/org.simantics.document.server/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.document.server/META-INF/MANIFEST.MF
@@ -24,7 +24,13 @@ Require-Bundle:
  org.simantics.document.server.io;visibility:=reexport,
  org.simantics.scl.db;bundle-version="0.1.3",
  org.slf4j.api,
+<<<<<<< Upstream, based on branch 'private/antti_threads' of ssh://villberg@gerrit.simantics.org:29418/simantics/platform.git
  org.simantics.threadlog
+=======
+ org.simantics.threadlog,
+ org.simantics.simulator.toolkit,
+ org.simantics.simulator.toolkit.db;bundle-version="1.0.0";visibility:=reexport
+>>>>>>> 82fa68e Generate parts of db client query code
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.simantics.document.server.Activator
 Export-Package: org.simantics.document.server,