integrity

jupyterlab · Jun 3, 2019 · d3226c1 · d3226c1
1 parent 7e2c183
commit d3226c1
Showing 1 changed file with 0 additions and 77 deletions.
diff --git a/packages/metapackage/package.json b/packages/metapackage/package.json
@@ -30,7 +30,6 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@jupyterlab/application": "^1.0.0-alpha.9",
     "@jupyterlab/application-extension": "^1.0.0-alpha.9",
     "@jupyterlab/apputils": "^1.0.0-alpha.9",
@@ -105,82 +104,6 @@
     "@jupyterlab/vdom": "^1.0.0-alpha.9",
     "@jupyterlab/vdom-extension": "^1.0.0-alpha.9",
     "@jupyterlab/vega5-extension": "^1.0.0-alpha.9"
-=======
-    "@jupyterlab/application": "^1.0.0-alpha.8",
-    "@jupyterlab/application-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/apputils": "^1.0.0-alpha.8",
-    "@jupyterlab/apputils-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/attachments": "^1.0.0-alpha.8",
-    "@jupyterlab/cells": "^1.0.0-alpha.9",
-    "@jupyterlab/codeeditor": "^1.0.0-alpha.8",
-    "@jupyterlab/codemirror": "^1.0.0-alpha.8",
-    "@jupyterlab/codemirror-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/completer": "^1.0.0-alpha.8",
-    "@jupyterlab/completer-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/console": "^1.0.0-alpha.8",
-    "@jupyterlab/console-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/coreutils": "^3.0.0-alpha.8",
-    "@jupyterlab/csvviewer": "^1.0.0-alpha.8",
-    "@jupyterlab/csvviewer-extension": "^1.0.0-alpha.9",
-    "@jupyterlab/docmanager": "^1.0.0-alpha.8",
-    "@jupyterlab/docmanager-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/docregistry": "^1.0.0-alpha.8",
-    "@jupyterlab/documentsearch": "^1.0.0-alpha.9",
-    "@jupyterlab/documentsearch-extension": "^1.0.0-alpha.10",
-    "@jupyterlab/extensionmanager": "^1.0.0-alpha.8",
-    "@jupyterlab/extensionmanager-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/faq-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/filebrowser": "^1.0.0-alpha.8",
-    "@jupyterlab/filebrowser-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/fileeditor": "^1.0.0-alpha.8",
-    "@jupyterlab/fileeditor-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/help-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/htmlviewer": "^1.0.0-alpha.9",
-    "@jupyterlab/htmlviewer-extension": "^1.0.0-alpha.9",
-    "@jupyterlab/hub-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/imageviewer": "^1.0.0-alpha.8",
-    "@jupyterlab/imageviewer-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/inspector": "^1.0.0-alpha.8",
-    "@jupyterlab/inspector-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/javascript-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/json-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/launcher": "^1.0.0-alpha.8",
-    "@jupyterlab/launcher-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/mainmenu": "^1.0.0-alpha.8",
-    "@jupyterlab/mainmenu-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/markdownviewer": "^1.0.0-alpha.8",
-    "@jupyterlab/markdownviewer-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/mathjax2": "^1.0.0-alpha.8",
-    "@jupyterlab/mathjax2-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/nbconvert-css": "^0.1.1-alpha.1",
-    "@jupyterlab/notebook": "^1.0.0-alpha.9",
-    "@jupyterlab/notebook-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/observables": "^2.2.0-alpha.8",
-    "@jupyterlab/outputarea": "^1.0.0-alpha.8",
-    "@jupyterlab/pdf-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/rendermime": "^1.0.0-alpha.8",
-    "@jupyterlab/rendermime-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/rendermime-interfaces": "^1.3.0-alpha.8",
-    "@jupyterlab/running": "^1.0.0-alpha.8",
-    "@jupyterlab/running-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/services": "^4.0.0-alpha.8",
-    "@jupyterlab/settingeditor": "^1.0.0-alpha.8",
-    "@jupyterlab/settingeditor-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/shortcuts-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/statusbar": "^1.0.0-alpha.8",
-    "@jupyterlab/statusbar-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/tabmanager-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/terminal": "^1.0.0-alpha.8",
-    "@jupyterlab/terminal-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/theme-dark-extension": "^1.0.0-alpha.9",
-    "@jupyterlab/theme-light-extension": "^1.0.0-alpha.9",
-    "@jupyterlab/tooltip": "^1.0.0-alpha.8",
-    "@jupyterlab/tooltip-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/ui-components": "^1.0.0-alpha.8",
-    "@jupyterlab/vdom": "^1.0.0-alpha.8",
-    "@jupyterlab/vdom-extension": "^1.0.0-alpha.8",
-    "@jupyterlab/vega5-extension": "^1.0.0-alpha.8"
->>>>>>> 107ef3b30... wip hub integration
   },
   "devDependencies": {
     "fs-extra": "^8.0.1",