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/MainView.tsx | |
| parent | 147c208a9a1196d2ded540e28dc3d7f26d5ba0a9 (diff) | |
| parent | 1310633790e3db50a31a1cc6d357306d7884a053 (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/client/views/MainView.tsx')
| -rw-r--r-- | src/client/views/MainView.tsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index b64986084..2cec1c052 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -322,6 +322,7 @@ export class MainView extends React.Component { addDocTab={emptyFunction} pinToPres={emptyFunction} onClick={undefined} + ruleProvider={undefined} removeDocument={undefined} ScreenToLocalTransform={Transform.Identity} ContentScaling={returnOne} @@ -385,6 +386,7 @@ export class MainView extends React.Component { addDocTab={this.addDocTabFunc} pinToPres={emptyFunction} removeDocument={undefined} + ruleProvider={undefined} onClick={undefined} ScreenToLocalTransform={Transform.Identity} ContentScaling={returnOne} |