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/nodes/FieldView.tsx | |
parent | 147c208a9a1196d2ded540e28dc3d7f26d5ba0a9 (diff) | |
parent | 1310633790e3db50a31a1cc6d357306d7884a053 (diff) |
fixed merge conflicts
Diffstat (limited to 'src/client/views/nodes/FieldView.tsx')
-rw-r--r-- | src/client/views/nodes/FieldView.tsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/views/nodes/FieldView.tsx b/src/client/views/nodes/FieldView.tsx index d9774303b..943d181d6 100644 --- a/src/client/views/nodes/FieldView.tsx +++ b/src/client/views/nodes/FieldView.tsx @@ -30,6 +30,7 @@ export interface FieldViewProps { leaveNativeSize?: boolean; fitToBox?: boolean; ContainingCollectionView: Opt<CollectionView | CollectionPDFView | CollectionVideoView>; + ruleProvider: Doc | undefined; Document: Doc; DataDoc?: Doc; onClick?: ScriptField; |