diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-05-15 22:41:58 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-05-15 22:41:58 +0530 |
| commit | 0cc83ef72b6b1b254d97bf07a97dd1fe936aa25a (patch) | |
| tree | bce434d8545a953fd943743f0714609f23529220 /src/client/views/Palette.tsx | |
| parent | 9c0b8ab5820232292e02fbf453e50261137a533c (diff) | |
| parent | 98c7540fff67c232c1b04f2130ee624f9a70afbd (diff) | |
resolved conflicts
Diffstat (limited to 'src/client/views/Palette.tsx')
| -rw-r--r-- | src/client/views/Palette.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/Palette.tsx b/src/client/views/Palette.tsx index 63744cb50..108eb83d6 100644 --- a/src/client/views/Palette.tsx +++ b/src/client/views/Palette.tsx @@ -1,8 +1,8 @@ import { IReactionDisposer, observable, reaction } from "mobx"; import { observer } from "mobx-react"; import * as React from "react"; -import { Doc } from "../../new_fields/Doc"; -import { NumCast } from "../../new_fields/Types"; +import { Doc } from "../../fields/Doc"; +import { NumCast } from "../../fields/Types"; import { emptyFunction, emptyPath, returnEmptyString, returnZero, returnFalse, returnOne, returnTrue } from "../../Utils"; import { Transform } from "../util/Transform"; import { DocumentView } from "./nodes/DocumentView"; |