random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-12-22 18:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Laurent Nguyen
2020-08-13 16:35:26 +02:00
parent 4fc9393b76
commit 5be6f982f9
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Explorer/Notebook/NotebookRenderer/NotebookRenderer.tsx
View File

@@ -30,11 +30,8 @@ import { CellType } from "@nteract/commutable/src";
import "./NotebookRenderer.less"; import "./NotebookRenderer.less";
import HoverableCell from "./decorators/HoverableCell"; import HoverableCell from "./decorators/HoverableCell";
import CellLabeler from "./decorators/CellLabeler"; import CellLabeler from "./decorators/CellLabeler";
<<<<<<< HEAD
import MonacoEditor from "../MonacoEditor/MonacoEditor"; import MonacoEditor from "../MonacoEditor/MonacoEditor";
=======
import * as cdbActions from "../NotebookComponent/actions"; import * as cdbActions from "../NotebookComponent/actions";
>>>>>>> master
export interface NotebookRendererBaseProps { export interface NotebookRendererBaseProps {
contentRef: any; contentRef: any;