diff options
| author | kimdahey <claire_kim1@brown.edu> | 2019-09-17 16:16:20 -0400 |
|---|---|---|
| committer | kimdahey <claire_kim1@brown.edu> | 2019-09-17 16:16:20 -0400 |
| commit | f520d5a821b515e0c216f055e93f0549bd6733a9 (patch) | |
| tree | d55d25a4280bf89d3c39fd8989700ca00b328a2e /src/client/views/Main.tsx | |
| parent | 147c208a9a1196d2ded540e28dc3d7f26d5ba0a9 (diff) | |
| parent | 1310633790e3db50a31a1cc6d357306d7884a053 (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/client/views/Main.tsx')
| -rw-r--r-- | src/client/views/Main.tsx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx index 0e687737d..11ec6f0c9 100644 --- a/src/client/views/Main.tsx +++ b/src/client/views/Main.tsx @@ -37,7 +37,6 @@ let swapDocs = async () => { (await Cast(CurrentUserUtils.UserDocument.workspaces, Doc))!.chromeStatus = "disabled"; (await Cast(CurrentUserUtils.UserDocument.recentlyClosed, Doc))!.chromeStatus = "disabled"; (await Cast(CurrentUserUtils.UserDocument.sidebar, Doc))!.chromeStatus = "disabled"; - CurrentUserUtils.UserDocument.chromeStatus = "disabled"; await swapDocs(); document.getElementById('root')!.addEventListener('wheel', event => { if (event.ctrlKey) { |