X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.document.server%2FMETA-INF%2FMANIFEST.MF;h=71eac90b2b89002e6bfb40bde160a47baf788ec8;hb=refs%2Fheads%2Fprivate%2Fantti_threads;hp=d7b561f8f7f653e4359904f40782d16578d71ac9;hpb=25b0e1909c94977871479b469da722ed38e980c0;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 d7b561f8f..71eac90b2 100644
--- a/bundles/org.simantics.document.server/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.document.server/META-INF/MANIFEST.MF
@@ -24,13 +24,9 @@ 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,
@@ -38,6 +34,7 @@ Export-Package: org.simantics.document.server,
  org.simantics.document.server.client,
  org.simantics.document.server.handler,
  org.simantics.document.server.request,
- org.simantics.document.server.serverResponse
+ org.simantics.document.server.serverResponse,
+ org.simantics.document.server.state
 Import-Package: org.simantics.layer0.utils.direct
 Bundle-ClassPath: .