Skip to content

Commit c622571

Browse files
committed
merge version conflict
1 parent c5f6eac commit c622571

File tree

5 files changed

+2693
-2914
lines changed

5 files changed

+2693
-2914
lines changed

dev_mode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
},
213213
"jupyterlab": {
214214
"name": "ElixirNote",
215-
"version": "4.0.0a28",
215+
"version": "4.0.0a27",
216216
"extensions": {
217217
"@jupyterlab/application-extension": "",
218218
"@jupyterlab/apputils-extension": "",

jupyterlab/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
VersionInfo = namedtuple("VersionInfo", ["major", "minor", "micro", "releaselevel", "serial"])
77

88
# DO NOT EDIT THIS DIRECTLY! It is managed by bumpversion
9-
version_info = VersionInfo(4, 0, 0, "alpha", 28)
9+
version_info = VersionInfo(4, 0, 0, "alpha", 27)
1010

1111
_specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}
1212

jupyterlab/staging/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,19 +200,19 @@
200200
"style-loader": "~3.3.1",
201201
"terser-webpack-plugin": "^4.1.0",
202202
"webpack": "^5.72.0",
203-
"webpack-bundle-analyzer": "^4.5.0",
203+
"webpack-bundle-analyzer": "^3.6.0",
204204
"webpack-cli": "^4.9.2",
205205
"webpack-merge": "^5.8.0",
206206
"whatwg-fetch": "^3.0.0",
207207
"worker-loader": "^3.0.2",
208-
"yarn-deduplicate": "^5.0.0"
208+
"yarn-deduplicate": "^2.1.1"
209209
},
210210
"engines": {
211211
"node": ">=12.0.0"
212212
},
213213
"jupyterlab": {
214214
"name": "ElixirNote",
215-
"version": "4.0.0a28",
215+
"version": "4.0.0a27",
216216
"extensions": {
217217
"@jupyterlab/application-extension": "",
218218
"@jupyterlab/apputils-extension": "",

0 commit comments

Comments
 (0)