diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-29 23:42:36 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-29 23:42:36 +0530 |
| commit | 188d9053edbc165e14a4e98124aad0525dd2a28e (patch) | |
| tree | 35c53a34c88683241dc179cc33c40770a3e1e6a7 /src/client/views/nodes/ComparisonBox.tsx | |
| parent | 2fb042f575626cc6f938eec57c8e71e45ff6b1d5 (diff) | |
| parent | 364da51465e05404479cb5682d2e2043e6855b23 (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/client/views/nodes/ComparisonBox.tsx')
| -rw-r--r-- | src/client/views/nodes/ComparisonBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/ComparisonBox.tsx b/src/client/views/nodes/ComparisonBox.tsx index f140cc6e5..616cddfcf 100644 --- a/src/client/views/nodes/ComparisonBox.tsx +++ b/src/client/views/nodes/ComparisonBox.tsx @@ -24,7 +24,7 @@ const ComparisonDocument = makeInterface(comparisonSchema, documentSchema); @observer export class ComparisonBox extends ViewBoxAnnotatableComponent<FieldViewProps, ComparisonDocument>(ComparisonDocument) { public static LayoutString(fieldKey: string) { return FieldView.LayoutString(ComparisonBox, fieldKey); } - protected multiTouchDisposer?: import("../../util/InteractionUtils").InteractionUtils.MultiTouchEventDisposer | undefined; + protected _multiTouchDisposer?: import("../../util/InteractionUtils").InteractionUtils.MultiTouchEventDisposer | undefined; private _disposers: (DragManager.DragDropDisposer | undefined)[] = [undefined, undefined]; @observable _animating = ""; |