diff options
| author | Monika Hedman <monika_hedman@brown.edu> | 2019-02-25 18:59:15 -0500 |
|---|---|---|
| committer | Monika Hedman <monika_hedman@brown.edu> | 2019-02-25 18:59:15 -0500 |
| commit | 7355089662c5cfd3cde73be50211400b8d5cdd59 (patch) | |
| tree | 7845d6ee25e3dbfebeeb40c17a10ffb556d2472b /src | |
| parent | 293532a50a5670d2cd04fed65df77173e2dbad67 (diff) | |
merging 2
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/collections/CollectionView.tsx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx index 99f76decf..03e1f1fa4 100644 --- a/src/client/views/collections/CollectionView.tsx +++ b/src/client/views/collections/CollectionView.tsx @@ -29,11 +29,7 @@ export class CollectionView extends React.Component<CollectionViewProps> { public static LayoutString(fieldKey: string = "DataKey") { return `<CollectionView Document={Document} -<<<<<<< HEAD - ScreenToLocalTransform={ScreenToLocalTransform} fieldKey={${fieldKey}} isSelected={isSelected} select={select} bindings={bindings} documentSize={documentSize} -======= ScreenToLocalTransform={ScreenToLocalTransform} fieldKey={${fieldKey}} panelWidth={PanelWidth} panelHeight={PanelHeight} isSelected={isSelected} select={select} bindings={bindings} ->>>>>>> 292ff1a8d75f8b15f9388d2c577e09a13836d5dc isTopMost={isTopMost} BackgroundView={BackgroundView} />`; } public active = () => { |