Commit c622571

committed

merge version conflict

1 parent c5f6eac commit c622571Copy full SHA for c622571

File tree

+2693

-2914

lines changed

+2693

-2914

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@`
`212`	`212`	`},`
`213`	`213`	`"jupyterlab": {`
`214`	`214`	`"name": "ElixirNote",`
`215`		`- "version": "4.0.0a28",`
	`215`	`+ "version": "4.0.0a27",`
`216`	`216`	`"extensions": {`
`217`	`217`	`"@jupyterlab/application-extension": "",`
`218`	`218`	`"@jupyterlab/apputils-extension": "",`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`VersionInfo = namedtuple("VersionInfo", ["major", "minor", "micro", "releaselevel", "serial"])`
`7`	`7`
`8`	`8`	`# 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)`
`10`	`10`
`11`	`11`	`_specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}`
`12`	`12`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -200,19 +200,19 @@`
`200`	`200`	`"style-loader": "~3.3.1",`
`201`	`201`	`"terser-webpack-plugin": "^4.1.0",`
`202`	`202`	`"webpack": "^5.72.0",`
`203`		`- "webpack-bundle-analyzer": "^4.5.0",`
	`203`	`+ "webpack-bundle-analyzer": "^3.6.0",`
`204`	`204`	`"webpack-cli": "^4.9.2",`
`205`	`205`	`"webpack-merge": "^5.8.0",`
`206`	`206`	`"whatwg-fetch": "^3.0.0",`
`207`	`207`	`"worker-loader": "^3.0.2",`
`208`		`- "yarn-deduplicate": "^5.0.0"`
	`208`	`+ "yarn-deduplicate": "^2.1.1"`
`209`	`209`	`},`
`210`	`210`	`"engines": {`
`211`	`211`	`"node": ">=12.0.0"`
`212`	`212`	`},`
`213`	`213`	`"jupyterlab": {`
`214`	`214`	`"name": "ElixirNote",`
`215`		`- "version": "4.0.0a28",`
	`215`	`+ "version": "4.0.0a27",`
`216`	`216`	`"extensions": {`
`217`	`217`	`"@jupyterlab/application-extension": "",`
`218`	`218`	`"@jupyterlab/apputils-extension": "",`

Comments

(0)