Skip to content

Commit e2d74b4

Browse files
committed
fix: build
1 parent 81bf97d commit e2d74b4

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

packages/react/src/examples/NotebookColormode.tsx

-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ const NotebookColormode = () => {
3434
}, []);
3535
return (
3636
<>
37-
<<<<<<< HEAD
3837
<Jupyter startDefaultKernel colormode={colormode}>
39-
=======
40-
<Jupyter colormode={colormode} startDefaultKernel>
41-
>>>>>>> main
4238
<Text
4339
fontSize={2}
4440
fontWeight="bold"

packages/react/webpack.config.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const ENTRY =
2020
// './src/app/App';
2121
// './src/examples/Bokeh';
2222
// './src/examples/Bqplot';
23-
// './src/examples/Cell';
23+
'./src/examples/Cell';
2424
// './src/examples/CellLite';
2525
// './src/examples/Cells';
2626
// './src/examples/CellsExecute';
@@ -37,21 +37,17 @@ const ENTRY =
3737
// './src/examples/JupyterLabAppHeadless';
3838
// './src/examples/JupyterLabAppHeadlessServerless';
3939
// './src/examples/JupyterLabAppServerless';
40-
// './src/examples/JupyterLabAppServiceManager';
40+
// './src/examples/JupyterLabAppServiceManager';/home/echarles/Content/datalayer-osp/src/tech/jupyter/ui
4141
// './src/examples/JupyterLabTheme';
4242
// './src/examples/KernelExecute';
4343
// './src/examples/KernelExecutor';
4444
// './src/examples/Kernels';
4545
// './src/examples/Lumino';
4646
// './src/examples/Matplotlib';
47-
'./src/examples/Notebook';
47+
// './src/examples/Notebook';
4848
// './src/examples/NotebookCellSidebar';
4949
// './src/examples/NotebookCellToolbar';
50-
<<<<<<< HEAD
51-
// './src/examples/NotebookColorMode';
52-
=======
5350
// './src/examples/NotebookColormode';
54-
>>>>>>> main
5551
// './src/examples/NotebookCollaborative';
5652
// './src/examples/NotebookExtension';
5753
// './src/examples/NotebookKernelChange';

0 commit comments

Comments
 (0)