diff options
| author | Melissa Zhang <mzhang19096@gmail.com> | 2020-04-22 23:40:32 -0700 |
|---|---|---|
| committer | Melissa Zhang <mzhang19096@gmail.com> | 2020-04-22 23:40:32 -0700 |
| commit | 4f3964ecaa67797237734deb4b2ae9aaaf77a940 (patch) | |
| tree | 04460478d173f56d3f2950fcf001ab63e000a9b8 /src/client/views/webcam | |
| parent | 13f182c2f138c25b0b57169dc94ecbfdd59483ef (diff) | |
| parent | d2682eba642d2f10e94822d9c9864a6477052e06 (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/client/views/webcam')
| -rw-r--r-- | src/client/views/webcam/DashWebRTCVideo.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/webcam/DashWebRTCVideo.tsx b/src/client/views/webcam/DashWebRTCVideo.tsx index 1d52ba38f..2ea011316 100644 --- a/src/client/views/webcam/DashWebRTCVideo.tsx +++ b/src/client/views/webcam/DashWebRTCVideo.tsx @@ -3,7 +3,7 @@ import React = require("react"); import { CollectionFreeFormDocumentViewProps } from "../nodes/CollectionFreeFormDocumentView"; import { FieldViewProps, FieldView } from "../nodes/FieldView"; import { observable, action } from "mobx"; -import { DocumentDecorations, CloseCall } from "../DocumentDecorations"; +import { DocumentDecorations } from "../DocumentDecorations"; import { InkingControl } from "../InkingControl"; import "../../views/nodes/WebBox.scss"; import "./DashWebRTCVideo.scss"; |