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/Main.tsx | |
| parent | 9c0b8ab5820232292e02fbf453e50261137a533c (diff) | |
| parent | 98c7540fff67c232c1b04f2130ee624f9a70afbd (diff) | |
resolved conflicts
Diffstat (limited to 'src/client/views/Main.tsx')
| -rw-r--r-- | src/client/views/Main.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx index b21eb9c8f..17c001971 100644 --- a/src/client/views/Main.tsx +++ b/src/client/views/Main.tsx @@ -1,6 +1,6 @@ import { MainView } from "./MainView"; import { Docs } from "../documents/Documents"; -import { CurrentUserUtils } from "../../server/authentication/models/current_user_utils"; +import { CurrentUserUtils } from "../util/CurrentUserUtils"; import * as ReactDOM from 'react-dom'; import * as React from 'react'; import { DocServer } from "../DocServer"; |