diff options
| author | kimdahey <claire_kim1@brown.edu> | 2020-01-16 11:46:12 -0500 |
|---|---|---|
| committer | kimdahey <claire_kim1@brown.edu> | 2020-01-16 11:46:12 -0500 |
| commit | acf72eb45bdcdda5a87a7017f698793d2feea1c4 (patch) | |
| tree | 44954c357775472102f335144478b074ed070237 /src/client/views/MainView.tsx | |
| parent | 6be0e19ed0bd13f3796f542affa5a2e52674650c (diff) | |
extra fixes after pull from master
Diffstat (limited to 'src/client/views/MainView.tsx')
| -rw-r--r-- | src/client/views/MainView.tsx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index 05bfee95b..b300b0471 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -39,12 +39,9 @@ import MarqueeOptionsMenu from './collections/collectionFreeForm/MarqueeOptionsM import InkSelectDecorations from './InkSelectDecorations'; import { Scripting } from '../util/Scripting'; import { AudioBox } from './nodes/AudioBox'; -<<<<<<< HEAD import SettingsManager from '../util/SettingsManager'; -======= import { TraceMobx } from '../../new_fields/util'; import RichTextMenu from '../util/RichTextMenu'; ->>>>>>> e410cde0e430553002d4e1a2f64364b57b65fdbc @observer export class MainView extends React.Component { |