File tree Expand file tree Collapse file tree 2 files changed +14
-2
lines changed
Expand file tree Collapse file tree 2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change 11# Changes here will be overwritten by Copier
2- _commit : b74d698
2+ _commit : 47f880e
33_src_path : https://github.com/python-project-templates/base.git
44add_docs : true
55add_extension : jupyter
Original file line number Diff line number Diff line change 4242 "test" : " jest --coverage --collectCoverageFrom=src/*.{js}"
4343 },
4444 "dependencies" : {
45+ <<<<<<< before updating
4546 "@jupyterlab/application" : " ^4.5.0" ,
4647 "@jupyterlab/apputils" : " ^4.5.10" ,
4748 "@jupyterlab/notebook" : " ^4.5.0" ,
4849 "@jupyterlab/services" : " ^7.5.0" ,
4950 "@lumino/disposable" : " ^2.1.4"
51+ =======
52+ "@jupyterlab/application" : " ^4.5.1" ,
53+ "@jupyterlab/apputils" : " ^4.6.1" ,
54+ "@jupyterlab/notebook" : " ^4.5.1" ,
55+ "@jupyterlab/services" : " ^7.5.1" ,
56+ "@lumino/disposable" : " ^2.1.5"
57+ >>>>>>> after updating
5058 },
5159 "devDependencies" : {
5260 "@babel/cli" : " ^7.28.3" ,
5361 "@babel/core" : " ^7.28.5" ,
5462 "@babel/eslint-parser" : " ^7.28.5" ,
5563 "@babel/preset-env" : " ^7.28.5" ,
56- "@jupyterlab/builder" : " ^4.4.10 " ,
64+ "@jupyterlab/builder" : " ^4.5.1 " ,
5765 "babel-jest" : " ^30.2.0" ,
5866 "cpy-cli" : " ^6.0.0" ,
5967 "eslint" : " ^8.57.1" ,
7078 "jest-junit" : " ^16.0.0" ,
7179 "jest-transform-css" : " ^6.0.3" ,
7280 "mkdirp" : " ^3.0.1" ,
81+ <<<<<<< before updating
7382 "prettier" : " ^3.7.3" ,
83+ =======
84+ "prettier" : " ^3.7.4" ,
85+ >>>>>>> after updating
7486 "rimraf" : " ^6.1.0"
7587 }
7688}
You can’t perform that action at this time.
0 commit comments