diff options
| author | kimdahey <claire_kim1@brown.edu> | 2019-08-29 14:32:53 -0400 |
|---|---|---|
| committer | kimdahey <claire_kim1@brown.edu> | 2019-08-29 14:32:53 -0400 |
| commit | 8e2e2c1126086cbc87432bb0466205f892d8ae98 (patch) | |
| tree | d28a6721bcc392906a0ebd091c4acd11ff4747c0 /src/client/util/DocumentManager.ts | |
| parent | 116c17c1e4ccf189d770d170d07a6bfbf95ca4e1 (diff) | |
| parent | 22a5999626b11cf75cafbcd421601e668438f6ad (diff) | |
fix merge conflicts
Diffstat (limited to 'src/client/util/DocumentManager.ts')
| -rw-r--r-- | src/client/util/DocumentManager.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts index 124faf266..ec731da84 100644 --- a/src/client/util/DocumentManager.ts +++ b/src/client/util/DocumentManager.ts @@ -204,4 +204,4 @@ export class DocumentManager { } } } -Scripting.addGlobal(function focus(doc: any) { DocumentManager.Instance.getDocumentViews(Doc.GetProto(doc)).map(view => view.props.focus(doc, true)) })
\ No newline at end of file +Scripting.addGlobal(function focus(doc: any) { DocumentManager.Instance.getDocumentViews(Doc.GetProto(doc)).map(view => view.props.focus(doc, true)); });
\ No newline at end of file |